tree 8ee4be05434da972c02904794c954461a818f93c
parent f16c85de94223b9baac9290967666f8077bcf40b
parent db25b9fb3b22d2bdbf9603786ead2e7189b9a544
author Kevin Chyn <kchyn@google.com> 1504201191 +0000
committer android-build-merger <android-build-merger@google.com> 1504201191 +0000

Merge "Fix fingerprint error messages on Keyguard / AOD" into oc-mr1-dev
am: db25b9fb3b

Change-Id: Id7b23cd947afaba4fbdf9bccaeaf355ef3ae1c1e