OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba3c4ba 3a3f495)
am 3a3f495e: am 23d4ebdc: am 74f8cb9c: am c3067882: Merge "Added android.permission...
authorFyodor Kupolov <fkupolov@google.com>
Thu, 30 Jul 2015 21:21:14 +0000 (21:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Jul 2015 21:21:14 +0000 (21:21 +0000)
* commit '3a3f495e2480235a83fdd9c7efe6810f003504bc':
  Added android.permission.PEERS_MAC_ADDRESS permission


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help