OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff8da7a c9b5f99)
am c9b5f99c: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 10 Dec 2012 23:23:15 +0000 (15:23 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 10 Dec 2012 23:23:15 +0000 (15:23 -0800)
* commit 'c9b5f99c1d1404b02b123771357be32430363ba2':


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