| commit | abb06de8ecfa151539ff130ed7a60038bef3bfd2 | [log] [tgz] |
|---|---|---|
| author | Ben Komalo <benkomalo@google.com> | Wed Sep 07 15:29:49 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Sep 07 15:29:49 2011 -0700 |
| tree | 285a63c1fe890195d1c57e0313b28fa4f8108309 | |
| parent | 04cf11c90bcbacd40766d714303f37780aaae357 [diff] | |
| parent | 0e66609c95047ba7e5c0408bdc88af4315fd35b1 [diff] |
Merge "Show factory reset option if encryption went bad."