diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:45:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:45:59 +0000 |
| commit | 866ebbd36f90cb566c5399b87eee0030113b8aa9 (patch) | |
| tree | c0c1434efac7994e39152c293e0ac65ab075af9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 27b13a2ef027c82292605a56aec9d994421303bb (diff) | |
| parent | 8d621a7dd1046e17ede7197b8fcf3b57335dd052 (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: 292c75a05a -s ours am: 4eaf217170 -s ours am: 8d621a7dd1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12755273
Change-Id: I2ff82547ae1efb5820c301f58fd1183079acd724
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions