summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Eric Laurent <elaurent@google.com> 2024-04-30 16:37:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-04-30 16:37:38 +0000
commit2108e8e2f4adcc49b532756eae3d3c98dd0a8a1d (patch)
tree365325d449d34142d7527512fb35a1d18eae4e96 /libs/androidfw/ZipFileRO.cpp
parenta0ffab1c98a43270e603afa1afc15a698094b48d (diff)
parent96285b3a719fbb1ef05a73ceff9e157329d60d08 (diff)
[automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState to AdiDeviceState" am: 5c1a88fea0 -s ours am: 4439d89139 -s ours am: 520d9dfa5b -s ours am: a23e3a9be9 -s ours am: 7730159c0b -s ours am: 96285b3a71 -s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26599511 Change-Id: I9da027a45ad3932f2c7c9d666374ca60a8798ae9 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