summaryrefslogtreecommitdiff
path: root/native/android/configuration.cpp
diff options
context:
space:
mode:
author Michael Mikhail <michaelmikhil@google.com> 2023-06-01 04:41:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-01 04:41:53 +0000
commit020fd16fa2bea432045f222da5b95467c155c6bf (patch)
tree978dd4da07204681249e1a0ea952f7250e6a4903 /native/android/configuration.cpp
parentb290c61871992d4d3135a5714d36e4542d08c384 (diff)
parentf864f8618ed55cc45d7e81a8ae62938b7e902ca6 (diff)
[automerger skipped] Merge "Verify URI permissions in MediaMetadata" into rvc-dev am: 02a632ff37 am: a2212c18cb -s ours am: b145277797 -s ours am: 52e794eeee -s ours am: 77e4746cd9 -s ours am: 36bf22cf49 -s ours am: daa71357e9 -s ours am: b43c742dd7 -s ours am: fa05c1b9b1 -s ours am: f864f8618e -s ours
am skip reason: Merged-In I384f8e230c909d8fc8e5f147e2fd3558fec44626 with SHA-1 b8a7fd8e6f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23174295 Change-Id: I12dbddb7f4eccf59ae743ddf1c3f9e050aabe3a5 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