OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 22bf280 31d519f)
am 31d519fe: (-s ours) am 66b5a58a: Merge "Fix init order so we have something to...
authorJeff Sharkey <jsharkey@android.com>
Thu, 27 Aug 2015 11:30:29 +0000 (11:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:30:29 +0000 (11:30 +0000)
* commit '31d519fe37f6132f01b6193fec91d9f9b5b97908':


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