OSDN Git Service

Merge "Show factory reset option if encryption went bad."
authorBen Komalo <benkomalo@google.com>
Wed, 7 Sep 2011 22:29:49 +0000 (15:29 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 7 Sep 2011 22:29:49 +0000 (15:29 -0700)
commitabb06de8ecfa151539ff130ed7a60038bef3bfd2
tree285a63c1fe890195d1c57e0313b28fa4f8108309
parent04cf11c90bcbacd40766d714303f37780aaae357
parent0e66609c95047ba7e5c0408bdc88af4315fd35b1
Merge "Show factory reset option if encryption went bad."