diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:44:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:44:38 +0000 |
| commit | 2994515320d1c45f122a85ba47a7a7eb38c4d4a5 (patch) | |
| tree | c0c1434efac7994e39152c293e0ac65ab075af9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5f98ac771efd53317278ebe67faf15ce2f7fe924 (diff) | |
| parent | ffffe00d375c628ced8cc5aa50080776d0c907fc (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: ffffe00d37 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12750223
Change-Id: I80c17c14bc36f833eb125c6afacc3b78be9ebd93
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions