diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-10 01:32:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 01:32:39 +0000 |
| commit | 343b7884724e1d31e57b82baf9752436dc282904 (patch) | |
| tree | b9f6ae549939e365cdaa9cdc8e1444bd7b56835f /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | ac318c815c8b13f0cd9aa4de8db6ab08344b54ae (diff) | |
| parent | e65d59eb5f1aaff3fa598c0aa9fbb4db92020f00 (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: 77579a973b -s ours am: e65d59eb5f -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: Icc885fb4e8ce75cc8d9314bd2a2acbf71db6874c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions