tree 3e1f335a37b4eaede4efe6d81a322dbd1b57aca3
parent eb648679bfc13f036af459c7365295bfa5c04d66
parent fc0b2e98c008aa7708048e558f97ae063c572f4f
author Fyodor Kupolov <fkupolov@google.com> 1438293768 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438293768 +0000

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

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