tree d9a593b3809c9b83136406be8121976c0d840bae
parent 0ace93f451bf5213bfe546d47c7878317681e27d
parent df00fc2d9ac02cde6df75b76a93929396a1f696b
author Jeff Brown <jeffbrown@google.com> 1347322235 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347322235 -0700

am df00fc2d: am b019250d: Add a permission for controlling wifi display.

* commit 'df00fc2d9ac02cde6df75b76a93929396a1f696b':
  Add a permission for controlling wifi display.