OSDN Git Service

Merge "Fix fingerprint error messages on Keyguard / AOD" into oc-mr1-dev
authorKevin Chyn <kchyn@google.com>
Thu, 31 Aug 2017 17:39:51 +0000 (17:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 Aug 2017 17:39:51 +0000 (17:39 +0000)
am: db25b9fb3b

Change-Id: Id7b23cd947afaba4fbdf9bccaeaf355ef3ae1c1e


Trivial merge