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