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:
04cf11c
0e66609
)
Merge "Show factory reset option if encryption went bad."
author
Ben Komalo
<benkomalo@google.com>
Wed, 7 Sep 2011 22:29:49 +0000
(15:29 -0700)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 7 Sep 2011 22:29:49 +0000
(15:29 -0700)
Trivial merge