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