summaryrefslogtreecommitdiff
path: root/libs/androidfw/LocaleData.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-10 00:04:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-10 00:04:30 +0000
commit3bc4c9a2084ef268d8a20fa3c39fc463dd32e7df (patch)
tree53f70054ab33200f75c88287fcee20e96f7d0aa7 /libs/androidfw/LocaleData.cpp
parent1099ff74bfd549f95c338ae4eeb29e7629c18c32 (diff)
parente4a2745266f8c32ea8df1c203eec91bda7e7e679 (diff)
[automerger skipped] Merge "Check URI permissions for resumable media artwork" into tm-qpr-dev am: e4a1d8f87f -s ours am: e4a2745266 -s ours
am skip reason: Merged-In Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3 with SHA-1 c13567e39c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24550945 Change-Id: Id0a04d69af913fb29d71497aa4e769f9d332c746 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/LocaleData.cpp')
0 files changed, 0 insertions, 0 deletions