summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Tim Yu <yunicorn@google.com> 2023-11-30 01:32:47 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-30 01:32:47 +0000
commit02222675f86bfebd8ef2cac86d3ecad583a7eefd (patch)
treed55012fc238f4164a7eb655abfcbabf8dd76d4ca /libs/androidfw/AssetsProvider.cpp
parenta728f6da7067cd6b55c26e20fda3791505ca81c4 (diff)
parent1ebfa77fa539abf9d1ec54431e7d4d37577d9233 (diff)
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Check permission of Autofill icon URIs" into sc-qpr1-dev am: e4ea46fd3f -s ours am: a400310b02 -s ours am: 74501f1e7c -s ours am: cb4a09c39c -s ours am: f2e64858d4 -s ours am: 48e87051d8 -s ours am: 1ebfa77fa5 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24709105 Change-Id: I47ca0cc6560442e2f1d41459a6103ec192daecb2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions