summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-18 18:58:07 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-18 18:58:07 +0000
commita1acec58ddae44a79ffaaab645187e7113e2dba8 (patch)
treef6e26618ccadc5bd488d26de9acced7fa9f4f97e /tools/aapt2/java/JavaClassGenerator_test.cpp
parent78515863e4fd0d87589ac9a1955754ff20f5252f (diff)
parentcd1665a8d6607b1fb60b5361ad28254c3c61ff23 (diff)
[automerger skipped] Merge "Merge "Workaround for crash from invalid snapshot" into rvc-dev am: 10250f67f1 am: 2a28c02401 am: 8def3186e2" into rvc-qpr-dev-plus-aosp am: cd1665a8d6 -s ours
am skip reason: Change-Id I48be367d8aafb3e17f11a73a73432617a247c0dd with SHA-1 c8ba260b4d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11897368 Change-Id: I131f4a3279b7846f5b10266b389921b4ae515af7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions