diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-10 01:51:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 01:51:21 +0000 |
| commit | 94fc18f36cd7c717ce74f5acc9c618abe150446b (patch) | |
| tree | da4cb2ad6c93805a36fe545bcac688babc18c18e /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 006fa9800e8206dc170affcb124cf32ee430fcaa (diff) | |
| parent | 343b7884724e1d31e57b82baf9752436dc282904 (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: 343b788472 -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: I2656daa8661c109c06a5555c164313843172eb31
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions