diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:47:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:47:05 +0000 |
| commit | c8445be03006d9c480d1a41af1c564f6e1d6ccd8 (patch) | |
| tree | c0c1434efac7994e39152c293e0ac65ab075af9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 03809d41d36e852f71831ae39b363b6f1252ee6c (diff) | |
| parent | 070b3f4a0f6e9279ea73c781e177b551cfab507e (diff) | |
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into rvc-dev am: 7944148774 am: f566c3611e am: c790cbb8e6 -s ours am: 070b3f4a0f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12750223
Change-Id: Id17cc093a4a70a32162331935d6f12fc4decf99c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions