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