OSDN Git Service

am 74f8cb9c: am c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS permissio...
authorFyodor Kupolov <fkupolov@google.com>
Thu, 30 Jul 2015 21:01:20 +0000 (21:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Jul 2015 21:01:20 +0000 (21:01 +0000)
* commit '74f8cb9c9bf2c354a17ce155977dc9d8bead000a':
  Added android.permission.PEERS_MAC_ADDRESS permission


Trivial merge