summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Evan Chen <evanxinchen@google.com> 2023-11-02 19:17:15 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-02 19:17:15 +0000
commitb178b6a105c5e4e43ffcb3f8784a766b01000cf5 (patch)
treec4b5b2570f63ac6f67fef18ddbd695c665f87a3f /libs/androidfw/FileStream.cpp
parent9193dfd568af7211ad7118a9781237e0ce4717e6 (diff)
parent3ed981a48d81617fef02549eb80528305c14d7c4 (diff)
[automerger skipped] Merge "Do not allow setting notification access across users." into tm-dev am: 2335fc14da am: 1ea7c1bad5 -s ours am: 6870f16bc9 -s ours am: d5d3a198a3 -s ours am: 3ed981a48d -s ours
am skip reason: Merged-In I6c478ebcc1d981faf2d125a4b41909c3b6a30a2a with SHA-1 ee88e15751 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25096532 Change-Id: Ic7496f88cd2676966f69d3610f4a9e317d5968e1 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