From: Paul Lawrence <paullawrence@google.com>
Date: Wed, 13 Aug 2014 19:55:41 +0000 (+0000)
Subject: am d6d0cd53: Merge "Bring up factory reset UI when decryption fails but password... 
X-Git-Tag: android-x86-6.0-r1~671^2~814^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3007a85e1136d942c6805c9384688b233565d782;p=android-x86%2Fpackages-apps-Settings.git

am d6d0cd53: Merge "Bring up factory reset UI when decryption fails but password is correct" into lmp-dev

* commit 'd6d0cd53d00a84619f3f90761ee3907732fac898':
  Bring up factory reset UI when decryption fails but password is correct
---

3007a85e1136d942c6805c9384688b233565d782