OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b44a7a0 20d8abc)
am 20d8abc6: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 6 Aug 2012 20:28:57 +0000 (13:28 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 Aug 2012 20:28:57 +0000 (13:28 -0700)
* commit '20d8abc638df1dba3c9dc95601aabed200a5abd1':


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