summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Rubin Xu <rubinxu@google.com> 2023-05-02 17:41:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-02 17:41:50 +0000
commit9cbad1514dacd60c71d0cd52374390a8eb664b0b (patch)
tree8d5c98127ea5ebe4eac15a0f034e679a4d9ca89a /libs/androidfw/ZipFileRO.cpp
parent695c77698a8d1304a8ea2131713b27ba46fd5167 (diff)
parent4726d6af7c20d08403a2ec49113ce3b5e6e5ccdf (diff)
Merge "Always clear password reset token when removing device owner" into udc-dev am: 65108620c4 am: 4726d6af7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22938376 Change-Id: If9783e4bc4920e2d51d9039e75cb5f7dac176a9c 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