diff options
author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:38:44 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:38:44 +0000 |
commit | ffffe00d375c628ced8cc5aa50080776d0c907fc (patch) | |
tree | 884167f03987e592389fcce8669d06b82d9479d1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | cd12f5f5ad701d5542ca2b8be1cbfb5e64be4549 (diff) | |
parent | 37572c0614368c8eeceedc823215ece1858b0101 (diff) |
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into rvc-dev am: 7944148774 am: f566c3611e -s ours am: 37572c0614 -s ours
am skip reason: Change-Id Ie5a0f8c3e9b92d348a78678a6ed192d440c45ffc with SHA-1 09c1b8ebf9 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12750223
Change-Id: I35233f0cbda795471e69ec7497fcd0e460992555
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions