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)

Trivial merge