OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0280b7 5acc909)
am 5acc9098: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Aug 2012 18:08:26 +0000 (11:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Aug 2012 18:08:26 +0000 (11:08 -0700)
* commit '5acc909860388a8863e3ec9d38a290fd418cce22':


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