summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2023-10-16 17:55:07 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-16 17:55:07 +0000
commit1c391eac48310ef95f2d96fb05f71e21fd831401 (patch)
tree02c9ad836bdce2a1f8c045f5335c5d773b08b2c0 /libs/androidfw/ApkParsing.cpp
parent5e3518daa93a211dfb9cf4066eda2deff84fe2b9 (diff)
parent751ef20537bc97cb343748400cba24d6052c350b (diff)
Merge "Remove KeyStore#state()" into main am: 28dc9370ca am: ac3cf1f778 am: 4154f307ae am: 5d6cf9754f am: 751ef20537
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2768548 Change-Id: I34a6c05aae52e111e9e023aeb99f1cc7402a79f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions