| commit | 23633d8afad62fda8f0d3abc0b1b46f6246cad4e | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Jul 25 14:25:26 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 25 14:25:26 2017 +0000 |
| tree | a090f1adb8286c7aec0c7bc0423945db4f00674b | |
| parent | 0ce7e7ecd11fae0a90b2a8bb552d05a29fc4a60c [diff] | |
| parent | 97072538d8ffc4890b26dfbc0874b64ec0b7dd26 [diff] |
Merge "Fingerprint: Show bouncer when fingerprint is disallowed" into oc-dr1-dev am: 544e628e16 am: 3137ed4789 am: 97072538d8 Change-Id: I92821e77e1469f666fb22787982cc26769be9a56