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 20:23:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-04 20:23:53 +0000
commita97c1d2ff58888ef93c781b6cb7bce064a0c7bb4 (patch)
tree4e452af1c0ad77fe9a92dd907e1ce9a2279221e9 /tools/aapt2/ResourceParser.cpp
parentb91b74684f149f6b81288667a565f5aafa660f1b (diff)
parent11d75d2539c2a97ed19f47d33cb3f234417d78a1 (diff)
Merge "Merge "Support setting primary provider" into udc-dev am: d07c89db48 am: 23c6f5e306 am: 99cd0f36db" into udc-qpr-dev-plus-aosp am: 11d75d2539
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22963326 Change-Id: Ic45b487618bad80face78ffe88f18a523de342b1 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