OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1023be9 8c1845a)
am 8c1845a6: (-s ours) am 76cbd841: am f4316f6d: (-s ours) Reconcile with jb-mr2...
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Aug 2013 23:58:45 +0000 (16:58 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Aug 2013 23:58:45 +0000 (16:58 -0700)
* commit '8c1845a6d669b03c2827965042f2e47e49f2d6b1':


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