tree 53487a80287726ee27e779e1514d2868c1735190
parent d9d2b3e9eccaea0eb8369228e97b5b0316d70b22
parent a0bbacbed8f0b5ee4f2fb2c11007b1b05d77bade
author Kevin Chyn <kchyn@google.com> 1504203155 +0000
committer android-build-merger <android-build-merger@google.com> 1504203155 +0000

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

Change-Id: I75716bb0276341928252419f13558eda755c6891