| commit | 5af8088b2aa6c8509ea1859dc2f1116c0722da71 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Jul 25 14:31:48 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 25 14:31:48 2017 +0000 |
| tree | a090f1adb8286c7aec0c7bc0423945db4f00674b | |
| parent | c622a021c9ae25426f9adc3568bf9e4a6a779491 [diff] | |
| parent | 82eb264659fe41fcc75ef28b2ec43b7f3f0b06e7 [diff] |
Merge "Merge "Fingerprint: Show bouncer when fingerprint is disallowed" into oc-dr1-dev am: 544e628e16 am: 8775ad8f19" into oc-mr1-dev-plus-aosp am: 82eb264659 Change-Id: Iee3c87347e573eadc21ce1973f57bc3a83f7bd6b