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:46:23 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-18 18:46:23 +0000
commitf28fb11e060f6fe0c2964dc5148804c6d9efcfed (patch)
tree5a33b71ef70191bf9852bba18770a6ff8879a0b0 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentcd1665a8d6607b1fb60b5361ad28254c3c61ff23 (diff)
parentefe9fb03f6f9be08bd5b30da1090e03ce0c61687 (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 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: Iaffce89737dee8a703ba2eef81b1e30a7c321e96
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions