From: Paul Lawrence <paullawrence@google.com>
Date: Thu, 28 May 2015 19:53:08 +0000 (+0000)
Subject: am 750648c5: Merge "Disable back button on crypto screen" into mnc-dev
X-Git-Tag: android-x86-7.1-r1~1317^2~521
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a25cf52c7ab590ab0c58d38a742f10d3d37fd63c;p=android-x86%2Fpackages-apps-Settings.git

am 750648c5: Merge "Disable back button on crypto screen" into mnc-dev

* commit '750648c5ae2b975d7aea45601d17f4c0796e8db4':
  Disable back button on crypto screen
---

a25cf52c7ab590ab0c58d38a742f10d3d37fd63c