summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Eric Laurent <elaurent@google.com> 2024-04-30 15:06:16 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-04-30 15:06:16 +0000
commitfc10de54707519480ea687a4368cecd21e6bcbe4 (patch)
tree6528f7271927c26aa1fd7ee46f53dca0448295f0 /libs/androidfw/ZipFileRO.cpp
parent6514908583408984248434f1a27d10e7e125fe83 (diff)
parent5c1a88fea0d4efae21ebe2a6be099a7ea67153a8 (diff)
[automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState to AdiDeviceState" am: 5c1a88fea0 -s ours
am skip reason: Merged-In Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3 with SHA-1 68a3c41363 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25240034 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26599511 Change-Id: I5154fac4f5707c8c4d5c18529e6905deba8da068 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