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