diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:28:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:28:18 +0000 |
| commit | dc9d907b8f69d11b469d595d207b2e55365c9143 (patch) | |
| tree | b7f99b81bdfb768a4e4f8cf8bab74676b6d5addf /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e1192c36bba870223482a9221816b8c8b0d5308f (diff) | |
| parent | 8df04e3975060e8c01138777bac5a60e309d33d7 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into pi-dev am: ade9bc9a97 -s ours am: 8df04e3975 -s ours
am skip reason: Change-Id Iee6af379515385777984da55048c1efd9339ed88 with SHA-1 be924dac10 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12768177
Change-Id: I63402887367ead56cfbbe380bfba4ef7f34612f3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions