summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Ashish Kumar Gupta <kumarashishg@google.com> 2024-08-27 09:19:45 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-08-27 09:19:45 +0000
commit7e1b5f3b4527e49103df293d9912b9971c1cfb53 (patch)
treef08b874c93877ea569a3b08c730f4058b7ce1095 /libs/androidfw/ZipFileRO.cpp
parent45eee1315916698073c5d5151ec4c884cd4d5bfd (diff)
parentbcc87531b2c04c130861dedf94ff672677ca92ec (diff)
[automerger skipped] Merge "Set no data transfer on function switch timeout for accessory mode" into sc-dev am: e3d46f4048 am: 1a2bdf2937 -s ours am: 9c4ba11177 -s ours am: 17b02447bf -s ours am: f1e0f997d6 -s ours am: df46c491cb -s ours am: f2358e6086 -s ours am: bcc87531b2 -s ours
am skip reason: Merged-In I698e9df0333cbb51dd9bd5917a94d81273a2784a with SHA-1 643bea502a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28696280 Change-Id: I1d77c3aecc2e9177d488b62c3e224e893673c049 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