summaryrefslogtreecommitdiff
path: root/tools/aapt2/SdkConstants.cpp
diff options
context:
space:
mode:
author Matt Casey <mrcasey@google.com> 2023-06-30 20:19:23 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-30 20:19:23 +0000
commita83886c7ace53d135ee09fcc39d1c09ba4cca541 (patch)
treec1b1b9542c673dfe6c595ccd0ae9baf0b507bbfb /tools/aapt2/SdkConstants.cpp
parentad2a263abfce020b9e35a3842a4bfc02b676f5b4 (diff)
parent336c47cc34822d1f82da90e0eeab466c06f8895d (diff)
[automerger skipped] Merge "[DO NOT MERGE] Update quickshare intent rather than recreating" into tm-dev am: 7455a41bd0 -s ours am: 0da99117c8 -s ours am: 681d561a3f -s ours am: c23c1647ee -s ours am: 1f4a4eb04c -s ours am: 336c47cc34 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23474146 Change-Id: Ib1f8db8200166951bd94de9d5dfdb23811485898 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/SdkConstants.cpp')
0 files changed, 0 insertions, 0 deletions