diff options
| author | 2023-10-07 03:47:26 +0000 | |
|---|---|---|
| committer | 2023-10-07 03:47:26 +0000 | |
| commit | 4ac86ddd3f8e7682e0b7f08def897245bd0865de (patch) | |
| tree | 3fe5cef0c19cdcbb1218e2a9e3a7c58995bce817 /libs/androidfw/ZipFileRO.cpp | |
| parent | ee4adabcd71426fc024f20a048cf8fd25c23f4e7 (diff) | |
| parent | 51ae293ef2a8c17e2a8dea919c36a5f7f54baa11 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: Check URI permissions for resumable media artwork" into rvc-dev am: e48d7291ca -s ours am: 2d941b0818 -s ours am: 99ae21062a -s ours am: b9ab54d757 -s ours am: 4dd7b2cfb9 -s ours am: 1cb821baf5 -s ours am: 6008c6155f -s ours am: 40a74a7b70 -s ours am: 10a0cf5e70 -s ours am: 2985b8ae46 -s ours am: 5c41a9ac62 -s ours am: 51ae293ef2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24640919
Change-Id: Ida82d524935c4492fdbcc68f24bf2bafc9e1737b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions