summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceParser.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-04 19:18:51 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-05-04 19:18:51 +0000
commit11d75d2539c2a97ed19f47d33cb3f234417d78a1 (patch)
tree26f1c065e99a12e9e435d282afacf49718c3bd8e /tools/aapt2/ResourceParser.cpp
parent24bd6cada4291232efb2df387af486d9605d26a4 (diff)
parenta8a7578934fddf71c53119ac499ea5a3aa3c6312 (diff)
Merge "Merge "Support setting primary provider" into udc-dev am: d07c89db48 am: 23c6f5e306 am: 99cd0f36db" into udc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions