summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Tim Yu <yunicorn@google.com> 2023-11-29 23:13:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-29 23:13:21 +0000
commit663c2cd745df42f702479655209faf2e969e88f4 (patch)
treead03940747f6a82ec84d9487594bbfe86efa940b /libs/androidfw/AssetManager.cpp
parent5cd9c1525e956527620c55cf08b283652223368a (diff)
parente311a0803f2282ee811562ce0f55a65c0d2efe88 (diff)
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Check permission of Autofill icon URIs" into sc-dev am: eee167817c -s ours am: 0937e3ac63 -s ours am: 7e5f84a8bb -s ours am: e311a0803f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24696686 Change-Id: Ifce518db571529cf82aa6a8a9ea0f570f41abd33 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions