summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorCurtis Belmonte <curtislb@google.com>2020-11-09 23:59:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-09 23:59:11 +0000
commit62a47dcb08556611f0b3bc76f08bf7a58dc241b8 (patch)
tree229caccbdaef1c0ad45dda7e7994d2ea77370e90 /tools/aapt2/java/JavaClassGenerator.cpp
parent6e185d5cad1da95da56546cd154882303bc48562 (diff)
parente422433ae5ad1a8a84b57f86ca32c8875b3cf827 (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12769285 Change-Id: Ic59ec71635037e566ff2b5f72a24792078e5d559
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions