summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Marzia Favaro <marziana@google.com> 2023-09-18 22:30:01 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-18 22:30:01 +0000
commita06139029cd9c79173c2fe486a32981d9ec5afa8 (patch)
treeb665ad8977b76f72750ccdac72984896e863f618 /libs/androidfw/FileStream.cpp
parent0a63571cad4fa2031e8414d9bbfa6f9c76c2e3b6 (diff)
parent5ab4a072f67b86e468c6891676a0a8ed54db646e (diff)
[automerger skipped] Require permission to unlock keyguard am: 6568e40be9 -s ours am: 57e16d7fa7 -s ours am: d577fd099b -s ours am: 64fd1622ca -s ours am: 2dd64205b5 -s ours am: 5ab4a072f6 -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c0042 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342147 Change-Id: I0e615fa3349555630e1b060ab31b454b976679f0 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