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:
b366f53
e46eea9
)
am e46eea9e: am 6f8fb436: Add a setting to enable encryption.
author
Jason parks
<jparks@google.com>
Thu, 13 Jan 2011 23:44:33 +0000
(15:44 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 13 Jan 2011 23:44:33 +0000
(15:44 -0800)
* commit '
e46eea9edabfba9f310dae2bdaa9aedc551cb1a8
':
Add a setting to enable encryption.
Trivial merge