tree cbcc19f512d92178b25da7ab9ce04eaaabc3ae16
parent 4a7b8feebce0c95be276b6c0ee8856b081f47067
parent a769c12f37e568c35c209bbd7297d67bf630b567
author Fyodor Kupolov <fkupolov@google.com> 1438290348 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438290348 +0000

am f9fdb08c: am 4988378c: Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev

* commit 'f9fdb08caae30e789d573ab3260fc87e9d43041b':
  Introduced android.permission.PEERS_MAC_ADDRESS permission