summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Ioana Alexandru <aioana@google.com> 2023-05-09 18:24:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-09 18:24:58 +0000
commit10edc4bfc4733b9a666ed74b156ac269cbf8ac04 (patch)
tree6e3ec56182e6bd84c9ede30f0c8eeea07e9cc1e1 /libs/androidfw/FileStream.cpp
parentf96c365e0f3bc8fabcffa807242fdaf4cd8c0f92 (diff)
parent9f31dc6b58cca6852dec294ea7fadd86d2358943 (diff)
[automerger skipped] Merge "Verify URI permissions for notification shortcutIcon." into rvc-dev am: eadfe8b90a -s ours am: 52922c7b14 -s ours am: a1e863a33e -s ours am: 099868aa0d -s ours am: e707b58e15 -s ours am: 2e13a4afde -s ours am: 9f31dc6b58 -s ours
am skip reason: Merged-In Iaf2a9a82f18e018e60e6cdc020da6ebf7267e8b1 with SHA-1 01a1598047 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908034 Change-Id: I4dc1cc3cbb0fdf8456e8f3e31e5b11c6e18fe336 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