OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee04e47 c53ce26)
am c53ce268: (-s ours) Reconcile with jb-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Sep 2012 15:21:38 +0000 (08:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Sep 2012 15:21:38 +0000 (08:21 -0700)
* commit 'c53ce26836eccfe9c0bb315d965bc73a9bd7b214':


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