summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorCurtis Belmonte <curtislb@google.com>2020-11-09 23:31:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-09 23:31:49 +0000
commit50472c1db24f7435c875857888d66665c73a6635 (patch)
tree4d74103311b8d8542e4c985050fa015c997983e8 /tools/aapt2/java/JavaClassGenerator.cpp
parent8df04e3975060e8c01138777bac5a60e309d33d7 (diff)
parent12e7baaddc650e5a9deca415091c1592cc5224fd (diff)
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into oc-mr1-dev am: 1a673296ae -s ours am: 12e7baaddc -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12768751 Change-Id: Ia19e591eaddde7d93eb8e691396b335f2860224d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions