OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f189a15 aca1bb4)
am aca1bb4a: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 15 Dec 2012 00:48:47 +0000 (16:48 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 15 Dec 2012 00:48:47 +0000 (16:48 -0800)
* commit 'aca1bb4ab86f3b27df72db37cab6bc3ccca088a9':


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