diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-11 21:09:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-11 21:09:16 +0000 |
| commit | 363acc94c1808212dbb6c2bbedc3cc11abb41005 (patch) | |
| tree | 46c6870c5a353b2ee032f5a8b8ba68f998d51b61 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8ac6d47743e8ab7d18353843176e208f39b5eb1e (diff) | |
| parent | 4f63de470e65f67c48f84e870079a89d261306cc (diff) | |
Merge "Merge "Do not start biometric auth if encrypted or lockdown" into rvc-dev am: 9253ddb5eb am: ae5825574d" into rvc-d1-dev-plus-aosp am: 4f63de470e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11840350
Change-Id: Id21f0fef11060b6eb7449f204b8262fb2b2e6c7b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions