diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-01 22:34:27 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-01 22:34:27 +0000 |
commit | 3e4112d1981c8172589914ae1ee19b132baf6061 (patch) | |
tree | ac0675b153e3be4cbc3a09b2b314fd9a31ce3924 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f5d35a351ddd4e83d99db4c6c092bc7e1b523e0b (diff) | |
parent | 3527b1ec47a0e0a37c8fdd216150e0266f957496 (diff) |
Merge "Merge "Log keyguard transitions after biometrics" into rvc-dev am: a5f7670b4c am: d2f6974ca7" into rvc-d1-dev-plus-aosp am: 4aa8dcaa78 am: 3527b1ec47
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040147
Change-Id: If19a0305ae9d7bf39931b3a23bc1e5e52cb7acfb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions