summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceValues.cpp
diff options
context:
space:
mode:
author Miranda Kephart <mkephart@google.com> 2023-06-20 22:19:08 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-20 22:19:08 +0000
commit31be982921ce6aee8e8699f240e9cc5b3e2da086 (patch)
treec2112082d5cfae1ef7b57bf92089221e41754415 /tools/aapt2/ResourceValues.cpp
parent368bc921422b7733aa93ce2e16ae74353a9f7b35 (diff)
parentee690f9858539bb098a3b3b47792dd96f2e0de82 (diff)
[automerger skipped] Merge "[DO NOT MERGE] Update quickshare intent rather than recreating" into sc-dev am: 4ef79c3ff3 -s ours am: 79506b053f -s ours am: 279a0e4fe9 -s ours am: e5e37a13ee -s ours am: db63c92be3 -s ours am: ee690f9858 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23516871 Change-Id: Ie04a537cc1e52a74edba5e1a0833ec2e31774403 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/ResourceValues.cpp')
0 files changed, 0 insertions, 0 deletions