am b3fd5e17
: (-s ours) am c3067882
: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
* commit 'b3fd5e172b8a5a794b167737ebe76fbe13d2c449':
This commit is contained in: