From: Ben Komalo Date: Wed, 7 Sep 2011 22:29:49 +0000 (-0700) Subject: Merge "Show factory reset option if encryption went bad." X-Git-Tag: android-x86-4.4-r1~2069 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=abb06de8ecfa151539ff130ed7a60038bef3bfd2;p=android-x86%2Fpackages-apps-Settings.git Merge "Show factory reset option if encryption went bad." --- abb06de8ecfa151539ff130ed7a60038bef3bfd2