OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6413e1 a27e1cb)
am a27e1cb2: am ee284023: am 8d028a87: Allow wireless charging during encrypt
authorVikram Aggarwal <viki@google.com>
Thu, 1 Nov 2012 02:39:33 +0000 (19:39 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 Nov 2012 02:39:33 +0000 (19:39 -0700)
* commit 'a27e1cb204e2d61588ea4004790f02f7ced4bd0e':


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