| commit | 4c8a58e16c50287d8758a340ef83635714c41fd5 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Jul 25 14:20:29 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 25 14:20:29 2017 +0000 |
| tree | 1d397e9227b2835a0afc64bf850748633cd8893d | |
| parent | 493f163e5edb01136bdd023e5c106a2db2202a49 [diff] | |
| parent | 8775ad8f194bdb0183941273c3e4f7e3d242988f [diff] |
Merge "Fingerprint: Show bouncer when fingerprint is disallowed" into oc-dr1-dev am: 544e628e16 am: 8775ad8f19 Change-Id: I14634d919e6d273521b0f305f655a4bddd11a54b