summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorCurtis Belmonte <curtislb@google.com>2020-11-09 23:39:07 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-09 23:39:07 +0000
commite422433ae5ad1a8a84b57f86ca32c8875b3cf827 (patch)
tree4d7cc0c99d8cff3df12043fd4fcc2c67b89cab68 /tools/aapt2/java/JavaClassGenerator.cpp
parentefa94e557f8f5c1519694b0ba4c44bed6a9c24cd (diff)
parenta10d4f43173603d2022ad5201e64066c1631243d (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 skip reason: Change-Id I0707c3f55eaf2a69c6625a3ceb3b5626b3676b26 with SHA-1 7786f4908f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12769285 Change-Id: I43d39fd10853543d296e024b3464fca66f6b34eb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions