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:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-18 18:58:46 +0000
commit0af9f18174b012c3892620f8b2523362f0a05138 (patch)
treef6e26618ccadc5bd488d26de9acced7fa9f4f97e /tools/aapt2/java/JavaClassGenerator_test.cpp
parenta1acec58ddae44a79ffaaab645187e7113e2dba8 (diff)
parentf28fb11e060f6fe0c2964dc5148804c6d9efcfed (diff)
[automerger skipped] Merge "Merge "Workaround for crash from invalid snapshot" into rvc-dev am: 10250f67f1 am: 67fd0fd1ac" into rvc-d1-dev-plus-aosp am: efe9fb03f6 -s ours am: f28fb11e06 -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: Ib6ae70b878335dcc045dcc96e44e31de81ef34b2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions