From: Maurice Lam <yukl@google.com>
Date: Tue, 21 Jul 2015 00:50:32 +0000 (+0000)
Subject: am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
X-Git-Tag: android-x86-7.1-r1~1235^2~65^2~96
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c97e5aba84835ef126bee9cd4c288b4edb5d97fa;p=android-x86%2Fpackages-apps-Settings.git

am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev

* commit 'd85fafce30f6fb71ea9de9de3c6d8aafc99dba33':
  [ScreenLock] Change title of encryption interstitial
---

c97e5aba84835ef126bee9cd4c288b4edb5d97fa