diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-01 16:40:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-01 16:40:55 +0000 |
| commit | 75a799dce16585e5fcf0fd0dd8e3fcae02ba4aee (patch) | |
| tree | 2e0791b33df957ec1c320d5e57ef3e441db41305 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 46ae18ff1eacacdf10f395b32a7751242b6439eb (diff) | |
| parent | bc6ce93dbd8becf22c736b7c592292eb92b48d62 (diff) | |
[automerger skipped] Merge "Merge "Send callingUserId from AuthService -> BiometricServiceBase" into rvc-dev am: 20534dcc8d am: e4057a4997 am: 0b5103795a" into rvc-qpr-dev-plus-aosp am: bc6ce93dbd -s ours
am skip reason: Change-Id I4ec89b9cb13caff397b1a1acd844962736290040 with SHA-1 5b5662d706 is in history
Change-Id: Ib7056321b624a138ff46d234b95d24839eae833c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions