OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee04e47 710aeba)
am 710aeba1: (-s ours) am c53ce268: (-s ours) Reconcile with jb-release - do not...
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 7 Sep 2012 20:40:53 +0000 (13:40 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Sep 2012 20:40:53 +0000 (13:40 -0700)
* commit '710aeba1ce0bf2d121aaaf659284074750b43c6e':


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