diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-01 16:28:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-01 16:28:21 +0000 |
| commit | d08ba148a8350e633f99734f78b7aa2f45e7e9f1 (patch) | |
| tree | 3c17f64255fdbe1a00b4c3461238653e9286a2fe /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 6a9e4794cfb04f6518ac11e7a495c45823ee2129 (diff) | |
| parent | bade9fa7d937b27eb7f08ae3f8af6b0c4060e852 (diff) | |
[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
am skip reason: Change-Id I4ec89b9cb13caff397b1a1acd844962736290040 with SHA-1 5433cd4070 is in history
Change-Id: Icd8fdda9f97e0bf56a28085f97a0e8e3b95905ee
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions