diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:45:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:45:10 +0000 |
| commit | 395b939413d90c4362031d950873ad42c7d5b325 (patch) | |
| tree | c0c1434efac7994e39152c293e0ac65ab075af9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 841942cbbea54a904523d1203401e1f5eb129296 (diff) | |
| parent | 23c2f7da159426d8b9d1bd5eee6243a4349205b9 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into qt-dev am: 5f94201861 -s ours am: e1192c36bb -s ours am: dbf3ed5aa6 -s ours am: 23c2f7da15 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12755273
Change-Id: If8734e2fa6574db8713db350d8dec343334c3134
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions