summaryrefslogtreecommitdiff
path: root/native/android/configuration.cpp
diff options
context:
space:
mode:
author Miranda Kephart <mkephart@google.com> 2023-06-20 19:00:35 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-20 19:00:35 +0000
commit279a0e4fe969754b1348f2bb45731679b6863a04 (patch)
treebae691b424a0709f4481b7f850c7710d3086102b /native/android/configuration.cpp
parent7edfbfa6943e4e528e05bf7c8bc32d89cd27d14c (diff)
parent79506b053ffc77e3bbd48079e50f005e13321cb3 (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23516871 Change-Id: I999e309d6fe3db933483d08ef46bc7a0fbce7273 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