OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: abbcdb7 4d5d510)
am 4d5d5107: (-s ours) Reconcile with jb-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 30 Jul 2012 22:16:42 +0000 (15:16 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 30 Jul 2012 22:16:42 +0000 (15:16 -0700)
* commit '4d5d510713ba79b044b0d62434e6067b2fb5fd01':


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