summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Vova Sharaienko <sharaienko@google.com> 2023-08-18 02:42:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-18 02:42:44 +0000
commit198ededbf81db59409aa1ac04abd98ae793547b8 (patch)
tree7d01d6fadee19d47eb0816a23230c0e8fb970c2f /libs/androidfw/ZipFileRO.cpp
parent4b275bcc45065068fb8a015430f8e3a7c71db2b0 (diff)
parent1339ff33e0c50094b4430911d84898b87a107303 (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: 3ae0a05fc4 -s ours am: aeea04cd38 -s ours am: 47ab5ec138 -s ours am: d69428ad84 -s ours am: 1339ff33e0 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24181420 Change-Id: Iacac9b56350b398af5955c7b3e7f22d70bd25a92 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions