tree b3f508329f5db46814cf21de5485ca26dea4c59c
parent 7e4613ede8ea0daa0428063566ff1cd99e45b50b
parent 3c01ac0b199d787f6a81b01ab3b6296421ea40a0
author Fyodor Kupolov <fkupolov@google.com> 1438294222 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438294222 +0000

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

* commit '3c01ac0b199d787f6a81b01ab3b6296421ea40a0':
  Introduced android.permission.PEERS_MAC_ADDRESS permission