| commit | 82eb264659fe41fcc75ef28b2ec43b7f3f0b06e7 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Jul 25 14:21:55 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jul 25 14:21:55 2017 +0000 |
| tree | 1d397e9227b2835a0afc64bf850748633cd8893d | |
| parent | aab3400ddf3729ce65f919c0aa9cc23ee0b08a70 [diff] | |
| parent | 4c8a58e16c50287d8758a340ef83635714c41fd5 [diff] |
Merge "Merge "Fingerprint: Show bouncer when fingerprint is disallowed" into oc-dr1-dev am: 544e628e16 am: 8775ad8f19" into oc-mr1-dev-plus-aosp