diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-10 01:02:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 01:02:42 +0000 |
| commit | 77579a973b982f6063857f0746f4c5c034bb619a (patch) | |
| tree | b7f99b81bdfb768a4e4f8cf8bab74676b6d5addf /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 8f077190bd633b6a990d2241027c94f7b2ad0ca2 (diff) | |
| parent | d2cf9d9d8b32ea98e6fcc5c49d5167e38a433c1c (diff) | |
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into oc-dev am: 4cf0088dee am: a10d4f4317 -s ours am: e422433ae5 -s ours am: 62a47dcb08 -s ours am: d2cf9d9d8b -s ours
am skip reason: Change-Id I0707c3f55eaf2a69c6625a3ceb3b5626b3676b26 with SHA-1 7786f4908f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12769285
Change-Id: I1b9c84d431acacca7194f230924688af2d2e7bbd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions