summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceParser.cpp
diff options
context:
space:
mode:
author Mikhail Naganov <mnaganov@google.com> 2023-07-11 17:04:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-11 17:04:50 +0000
commit18505f6d516f2d57f046d86de5d5c00ab570cd98 (patch)
tree768cdf22a76beb587db8b8cda6b3fabeb0fba997 /tools/aapt2/ResourceParser.cpp
parent2111aa47eb98fde509f6f01589f18d8405c7842a (diff)
parent87b74bceede96d26e52cf04ac252aad64ffba9ec (diff)
Merge changes Ie4161bb9,I6e61ba1c into udc-dev-plus-aosp am: 97dc5e274f am: 87b74bceed
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983402 Change-Id: I7a7e6da6f35329238f33adfc3c365dcf2cf09625 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions