OSDN Git Service

am b3fd5e17: (-s ours) am c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS...
authorFyodor Kupolov <fkupolov@google.com>
Thu, 27 Aug 2015 11:34:49 +0000 (11:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:34:49 +0000 (11:34 +0000)
commitbf68f8d4c89e38667c607ecadd1cc36a0b6362ce
tree7f84c40aaa75cd61f165f55c1ed04452351a1edd
parent3ee1bc7d2193b1bbbfcca84669032e7a71d88504
parentb3fd5e172b8a5a794b167737ebe76fbe13d2c449
am b3fd5e17: (-s ours) am c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev

* commit 'b3fd5e172b8a5a794b167737ebe76fbe13d2c449':