summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2024-04-12 14:24:49 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-04-12 14:24:49 +0000
commit33154f592bc8f24b2d48c0d165ae7eeb9cb28a5d (patch)
tree0b410ad2f71c910d4ef804b1004058d729d8b141 /libs/androidfw/ZipFileRO.cpp
parentb60c04df4ed48258583c55ac97e7cc619a1a1067 (diff)
parented023dbd63eca12fb98e9f35250e5f1747ec290f (diff)
Merge "Remove android.security.KeyStore#getInstance()" into main am: 92e7cc4cdb am: ed023dbd63
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3028743 Change-Id: I68d2206545a1d9d8a5d788e6b69e2201f80b9bbc 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