[automerger skipped] Merge "Revert "Escape single quotes in aapt2"" into tm-dev am: d63cdb916d am: d16011d658 am: f1439835cf -s ours
am skip reason: Merged-In I775b8a304e76a83934c36886c17cf23560914d21 with SHA-1 49956a73c1 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18134683
Change-Id: I5e8eed0f4f5c727e407e3a9b5060c7e8a9d8409b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: