OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d0a9d5b 9cff5e3)
am 9cff5e3f: am f4b1aefb: (-s ours) am 8638eeb4: (-s ours) Reconcile with jb-mr1...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:00:49 +0000 (13:00 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:00:49 +0000 (13:00 -0700)
* commit '9cff5e3f4a534c5472b8a8e269f34cdca2ebff8c':


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