summaryrefslogtreecommitdiff
path: root/native/android/configuration.cpp
diff options
context:
space:
mode:
author Miranda Kephart <mkephart@google.com> 2023-06-20 21:34:31 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-20 21:34:31 +0000
commit48267a3be7a6d82a895b95de0977a15c7b2b59b2 (patch)
treee626a08e254b6c57294b57ac5f7b456b9370fcf2 /native/android/configuration.cpp
parentfc9fc4baca46e0c47326c397a44c9e0d36c00539 (diff)
parent53032ac07e37c57fc6090fc6f0224d4738c59498 (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: 53032ac07e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23516871 Change-Id: I687a5f3754d09f7c6a79c2b9a00e407e9f30f183 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'native/android/configuration.cpp')
0 files changed, 0 insertions, 0 deletions