summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Tim Yu <yunicorn@google.com> 2023-11-28 18:53:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-28 18:53:50 +0000
commit8c980ef2b385ba3d8825c409cfb96bca9f99cb00 (patch)
tree7ef472bd56a31f62eb1ebb4743e82d6c05cd4919 /libs/androidfw/FileStream.cpp
parenta64d81db334415b15205261740df97fbf56a0f28 (diff)
parent7e58d5c779d321b47964fb2434c4afc553d8dc81 (diff)
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Check permission of Autofill icon URIs" into udc-dev am: 0d1b6ea778 -s ours am: 7e58d5c779 -s ours
am skip reason: Merged-In I48879174664b70ced90492bb0991dc91cbf89b79 with SHA-1 0698b8fe72 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24709104 Change-Id: I2a2fd11c9e7454f58eb965d2a1ecab0617ada4d7 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