OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e8455b d82fa08)
am d82fa081: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 20 May 2013 15:26:23 +0000 (08:26 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 May 2013 15:26:23 +0000 (08:26 -0700)
* commit 'd82fa081f96985ceef99f523a83e2bb365b949b1':


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