diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:28:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:28:54 +0000 |
| commit | dbf3ed5aa6ba6387ab5dbb83afc5c70d495d5610 (patch) | |
| tree | b47c311bbc29c4fdd301d1cc96d797b28e1fdede /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 4e7a7d3cd35bfbb2369a8c0abdad187f534728f6 (diff) | |
| parent | e1192c36bba870223482a9221816b8c8b0d5308f (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12755273
Change-Id: I434babeafa4fa4e28a8252f5e2c4869b3bfccbd8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions