summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorCurtis Belmonte <curtislb@google.com>2020-10-09 00:37:02 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-10-09 00:37:02 +0000
commit6a15b41f1a9be9a51dc20b39e0456373e6bdbab9 (patch)
tree6f74292a796aa0f0d1030dc98d865dbf5f93cedd /tools/aapt2/java/JavaClassGenerator_test.cpp
parent68d12bb775fb6ed2febe2ba245171a34c85611bf (diff)
parenta1d67979b540f05d487fa6224ba16c9f5c8b6f3a (diff)
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into rvc-qpr-dev am: a1d67979b5 -s ours
am skip reason: Change-Id I3a810cd7e6b97333f648c978e44242662342ec57 with SHA-1 90433d3f12 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12749746 Change-Id: Ibbb87a1ca69fab9f798e25f763f001783c0a333e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions