summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Alexei Nicoara <ancr@google.com> 2024-01-10 20:06:40 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-01-10 20:06:40 +0000
commitde9903cfae37f29453f33ce10936544e86f83d7e (patch)
tree3dcdfc91b56ca8bdaa33e3b761de0fff590ba956 /libs/androidfw/FileStream.cpp
parentd72883a341bb9247add5d17ae1d5984257e72cc1 (diff)
parentd43dab5284eb2a4d7abaf6fdd171f54a1f04ce3a (diff)
Merge "[Bugfix] avoid deadlock caused by android.bg and RollbackManagerServiceHandler" into main am: 2dbefb7f42 am: 9e2ec571f5 am: d43dab5284
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2899109 Change-Id: I37c39213c4acdd0d67f88c17e6d1eab31327c421 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