From: Fyodor Kupolov Date: Thu, 27 Aug 2015 20:20:05 +0000 (+0000) Subject: am bf68f8d4: am b3fd5e17: (-s ours) am c3067882: Merge "Added android.permission... X-Git-Tag: android-x86-7.1-r1~1970 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c9b7c7d19a3444ecc83652db1e4868ea19001834;p=android-x86%2Fpackages-apps-Settings.git am bf68f8d4: am b3fd5e17: (-s ours) am c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev * commit 'bf68f8d4c89e38667c607ecadd1cc36a0b6362ce': --- c9b7c7d19a3444ecc83652db1e4868ea19001834