diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:28:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:28:26 +0000 |
| commit | 279ff9fd88c9764756060b68fe200596c27cf124 (patch) | |
| tree | c0c1434efac7994e39152c293e0ac65ab075af9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 62714132517eebae4582335a5b3318f8708acce5 (diff) | |
| parent | f8e573fff3a329b83e5d934c2b4896ef47765110 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into qt-qpr1-dev am: f228451841 -s ours am: fc7b7755ca -s ours am: f8e573fff3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12754868
Change-Id: If2764d3abd7d97b97944802eeecd9694f6e8a2e3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions