| commit | 97072538d8ffc4890b26dfbc0874b64ec0b7dd26 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Jul 25 14:15:51 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 25 14:15:51 2017 +0000 |
| tree | 1d397e9227b2835a0afc64bf850748633cd8893d | |
| parent | a72dabc9395c93aa7b9a8647c8a73210085e3ca7 [diff] | |
| parent | 3137ed4789f9255a383a8be33903ed9bb923d3ab [diff] |
Merge "Fingerprint: Show bouncer when fingerprint is disallowed" into oc-dr1-dev am: 544e628e16 am: 3137ed4789 Change-Id: Ib7ac02864c574035de9ee37cfd4f4e39813522e7