OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc45334 eddcf88)
am eddcf88e: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Jul 2013 15:08:04 +0000 (08:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Jul 2013 15:08:04 +0000 (08:08 -0700)
* commit 'eddcf88e64f353be6a85f900e9443583adfe3a65':


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