summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Chun-Wei Wang <wangchun@google.com> 2023-10-28 17:37:15 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-28 17:37:15 +0000
commit9fa0df530167e87caa2121338b618b6fd2ae3119 (patch)
tree750c1102294cf0336ee4d178f4b90c8c3c7d66d6 /libs/androidfw/FileStream.cpp
parentc8d8018cbad059d63708e0f368123f4568722f4f (diff)
parent22dfb02a970905812b4e6a4d1cdbf5355ee7ffe0 (diff)
Merge "Enable lockout timeout" into main am: f9668c392e am: 00e81ec1a4 am: 22dfb02a97
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2804813 Change-Id: Id662074c285b5667915bf4d455c25267822dbd79 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