diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-10 01:16:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 01:16:36 +0000 |
| commit | e65d59eb5f1aaff3fa598c0aa9fbb4db92020f00 (patch) | |
| tree | b47c311bbc29c4fdd301d1cc96d797b28e1fdede /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | beda396d64cbbc53016136208a562a7f90073742 (diff) | |
| parent | 77579a973b982f6063857f0746f4c5c034bb619a (diff) | |
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into oc-dev am: 4cf0088dee am: a10d4f4317 -s ours am: e422433ae5 -s ours am: 62a47dcb08 -s ours am: d2cf9d9d8b -s ours am: 77579a973b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12769285
Change-Id: I36c060a7dc9f3570b81ae396df7f3df1a27fc816
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions