summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-10 02:16:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-10 02:16:58 +0000
commitcdbede64430230cb581a11322d5e3ac622536198 (patch)
treed1fd89b9187da8769e74e51c1694cb0c39758a84 /libs/androidfw/ConfigDescription.cpp
parent49281f21a5c36196b9c21c4f935ac9d33842bcb6 (diff)
parent055c43b61bad42864aa10d123e1843719b8a8124 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-dev am: 055c43b61b -s ours
am skip reason: Merged-In Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3 with SHA-1 b45a519014 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24642267 Change-Id: I8bb46f1b83fe7dd383ee6c210d02e672bc5e57a9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
0 files changed, 0 insertions, 0 deletions