summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Tim Yu <yunicorn@google.com> 2023-11-30 02:19:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-30 02:19:27 +0000
commit71d8f5a18ee6df4033c3c3340f110dcc492d9953 (patch)
tree4de90a079d0044694473cf1d02c32d56d532cd25 /libs/androidfw/FileStream.cpp
parent03dd24c25e61cbae880d3931b98a9e83b6f24419 (diff)
parentf0bef0794d49e6e4a0431716abdb54928f9dfd55 (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: 02222675f8 -s ours am: f0bef0794d -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24709105 Change-Id: Idd6ead975e8d9019e4922c1391896f8dc80efa49 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions