OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a2018c9
9ad7e7e
)
am 9ad7e7e3: am 8d028a87: Allow wireless charging during encrypt
author
Vikram Aggarwal
<viki@google.com>
Mon, 29 Oct 2012 22:28:00 +0000
(15:28 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 29 Oct 2012 22:28:00 +0000
(15:28 -0700)
* commit '
9ad7e7e3dabc0c0125f1373164857e8782e443dd
':
Allow wireless charging during encrypt
Trivial merge