summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Josh Tsuji <tsuji@google.com> 2023-03-23 20:42:05 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-23 20:42:05 +0000
commit5fe37d0a1ab0f724731298fcbf17be2525e98beb (patch)
tree0c06fba3aa082ab00c0199ec71bb595a5141eb5d /libs/androidfw/FileStream.cpp
parentb7793f5891c0349207455ec2e4138a8c55aa9e02 (diff)
parent81229f82b6093c27cbf76dcebddefbd90d9a2921 (diff)
Merge "Revert "Keep keyguard visible if we're launching an occluding activity over a going-away keyguard."" into tm-qpr-dev am: 0330bedcb2 am: 81229f82b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22223355 Change-Id: Ia9ba9905f276aabcb6559848300c411707e23f76 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