summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Beth Thibodeau <ethibodeau@google.com> 2023-10-10 06:47:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-10 06:47:06 +0000
commitde20ac6dbdeabbdd6a6e0486581ff600d4ddb09e (patch)
treea6bcaff6d4249c5fbcf70dc8f5c120d101466467 /libs/androidfw/ConfigDescription.cpp
parente603fbcbf5a180410e13bb49f85a440e556efaf6 (diff)
parent531fe3498155cd89b9cd77c13ce70e7c9a5295eb (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into sc-dev am: 055c43b61b -s ours am: cdbede6443 -s ours am: ff6c98c175 -s ours am: ac22d32daa -s ours am: e2a0b727c8 -s ours am: f4feb1e9f8 -s ours am: 373c2479c5 -s ours am: 531fe34981 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24642267 Change-Id: I7ec12cf7a8dfe05e449c1d3dfe5f168aa8bee531 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