diff options
| author | Kevin Chyn <kchyn@google.com> | 2020-06-19 19:12:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-19 19:12:47 +0000 |
| commit | 5731877f1e5d488eaeda1684c7a80e6999099b8b (patch) | |
| tree | 93b884eaf9f408c3d316c7c45e0eefaab0f2fd7b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 811cf5d8f54a795be87d1468d02d35e64409679e (diff) | |
| parent | 35eb8a152b7f4cc5bd3b7819942573cffbbca2a3 (diff) | |
Merge changes from topic "b/159260556" into rvc-dev
* changes:
Revert "Do not start biometric auth if encrypted or lockdown"
Revert "Add SafetyNet logging for b/79776455"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions