OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 731b4c3 ed7bc2f)
am ed7bc2fa: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 29 May 2013 15:10:37 +0000 (08:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 May 2013 15:10:37 +0000 (08:10 -0700)
* commit 'ed7bc2fa007ced0587672428b788dc4bb9c2451f':


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