summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Vova Sharaienko <sharaienko@google.com> 2023-08-18 02:39:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-18 02:39:58 +0000
commit15478f811af7a40e6d4dabb2bf97da817098f103 (patch)
tree7d01d6fadee19d47eb0816a23230c0e8fb970c2f /libs/androidfw/FileStream.cpp
parent81b656e7d2d74368bede8af5fc1187bf4c0151e4 (diff)
parent97164a6f73d10d08ac85338d571dd2f30377abfc (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE Make log reader thread a class member" into rvc-dev am: 7aec1d83d1 am: 4a0dc5a15c -s ours am: 508bbf100f -s ours am: 547b64e1cc -s ours am: 67401687fc -s ours am: 367219bb7c -s ours am: d33640d502 -s ours am: 89e27b189c -s ours am: f527936317 -s ours am: 97164a6f73 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24181420 Change-Id: I8471ce347082bae9c2044dd344812401cf40a401 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