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