diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-10 00:17:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 00:17:22 +0000 |
| commit | d2cf9d9d8b32ea98e6fcc5c49d5167e38a433c1c (patch) | |
| tree | 4d74103311b8d8542e4c985050fa015c997983e8 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | fd1f963c3216b0d76d5accec6b5b226aa873ccad (diff) | |
| parent | 62a47dcb08556611f0b3bc76f08bf7a58dc241b8 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12769285
Change-Id: I67f1a240fde0c05b64d4d9557df3a7736d7fcfb2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions