summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceValues.cpp
diff options
context:
space:
mode:
author Miranda Kephart <mkephart@google.com> 2023-06-20 21:32:07 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-20 21:32:07 +0000
commitee690f9858539bb098a3b3b47792dd96f2e0de82 (patch)
treedc8d69a9ab35d9833bc270fb24f9314e433bbb3f /tools/aapt2/ResourceValues.cpp
parenta79bf2cf2bc81e2a50c84173e244ebd2b55f746b (diff)
parentdb63c92be35508db4959139295f31096a56d8e32 (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23516871 Change-Id: Idb334e298eb770976311250292e27f95a875029d 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