diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:29:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:29:16 +0000 |
| commit | a82898ba3468afbc3fdfb38cb49250afcf3a0d93 (patch) | |
| tree | b47c311bbc29c4fdd301d1cc96d797b28e1fdede /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | dbf3ed5aa6ba6387ab5dbb83afc5c70d495d5610 (diff) | |
| parent | dc9d907b8f69d11b469d595d207b2e55365c9143 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into pi-dev am: ade9bc9a97 -s ours am: 8df04e3975 -s ours am: dc9d907b8f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12768177
Change-Id: I44d670c851ae19a2733a600f01886800cddb7ce0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions