From: Maurice Lam <yukl@google.com>
Date: Wed, 5 Aug 2015 00:46:45 +0000 (+0000)
Subject: am 311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
X-Git-Tag: android-x86-7.1-r1~1235^2~65^2~31
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a2f78eafca1008555315517c5e1ef7ef0bfb1ca0;p=android-x86%2Fpackages-apps-Settings.git

am 311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev

* commit '311a2d952522eb61a513670a32462d22504401b1':
  [Fingerprint] Update string for enrolling
---

a2f78eafca1008555315517c5e1ef7ef0bfb1ca0