OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eaac5df a6dd202)
am a6dd202d: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 18 Dec 2012 17:46:45 +0000 (09:46 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Dec 2012 17:46:45 +0000 (09:46 -0800)
* commit 'a6dd202da14c2a0e75ea03807458f5c8cd319888':


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