diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-01 16:41:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-01 16:41:53 +0000 |
| commit | 501ec20f30fdca17dbb64ffcf10312f55a1d7f45 (patch) | |
| tree | ade9dbceb451111417491d0f903ef15525ec12ad /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1c37d527d36bf418d5e4b83fc0823ab682785917 (diff) | |
| parent | 91b1d389c403186372824720bc23963a195c287f (diff) | |
Merge "[automerger skipped] Merge "Merge "Send callingUserId from AuthService -> BiometricServiceBase" into rvc-dev am: 20534dcc8d am: 9710f8eaab" into rvc-d1-dev-plus-aosp am: bade9fa7d9 -s ours" into rvc-qpr-dev-plus-aosp am: 91b1d389c4 -s ours
am skip reason: Change-Id I4ec89b9cb13caff397b1a1acd844962736290040 with SHA-1 5433cd4070 is in history
Change-Id: Ica63f17f53468f4eab1893204f591f34077b2a0c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions