diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-01 16:41:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-01 16:41:09 +0000 |
| commit | aae4e4d007449191e2498feee7a1950dd43bd150 (patch) | |
| tree | 2e0791b33df957ec1c320d5e57ef3e441db41305 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 75a799dce16585e5fcf0fd0dd8e3fcae02ba4aee (diff) | |
| parent | 6a9e4794cfb04f6518ac11e7a495c45823ee2129 (diff) | |
[automerger skipped] Merge "Merge "Send callingUserId from AuthService -> BiometricServiceBase" into rvc-dev am: 20534dcc8d am: e4057a4997 am: 3609dfb444" into rvc-qpr-dev-plus-aosp am: 6a9e4794cf -s ours
am skip reason: Change-Id I4ec89b9cb13caff397b1a1acd844962736290040 with SHA-1 5433cd4070 is in history
Change-Id: I023536a369a749322ca8c4b53171d39e15ef9594
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions