summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceTable.cpp
diff options
context:
space:
mode:
author Chiachang Wang <chiachangwang@google.com> 2022-06-24 07:05:48 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-24 07:05:48 +0000
commitd3c9bdd0a8fecf3c788634a4bd5169518f51c67c (patch)
treeb276b1159f578f771e4c257359b4f2eaf97862f6 /tools/aapt2/ResourceTable.cpp
parent8f0b5b97e8b02938e9b489c96acfaa955d6961cd (diff)
parent1db6dc88c676217302988f8a5a15f018085bf548 (diff)
[automerger skipped] Merge "Stop using invalid URL to prevent unexpected crash" into qt-dev am: 3ac8d1dc2f am: dadbab8ae8 am: 14f1bec4c2 am: 96f4ca0fbf -s ours am: 13d9983159 -s ours am: 0558135223 -s ours am: 76e31b13c2 -s ours am: ff6bece9c0 -s ours am: 656430e9ce -s ours am: 1db6dc88c6 -s ours
am skip reason: Merged-In I22903414380b62051f514e43b93af992f45740b4 with SHA-1 fe57c5bf89 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715266 Change-Id: Ib52ca1ef484728d18075eea928ab9f4a2e570f8f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/ResourceTable.cpp')
0 files changed, 0 insertions, 0 deletions