OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ee1bc7 b3fd5e1)
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)
* commit 'b3fd5e172b8a5a794b167737ebe76fbe13d2c449':


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