diff options
| author | 2022-12-22 00:33:15 +0000 | |
|---|---|---|
| committer | 2022-12-22 00:33:15 +0000 | |
| commit | 077372e2e44b210188502d27170ba5c4c5efea9a (patch) | |
| tree | 696948b3ade209f6caa911953655840a79d2d45a /libs/androidfw/ApkParsing.cpp | |
| parent | bb9f4937fd2fc687a9cca559e7cea7b3411cbd6a (diff) | |
| parent | cd3609306deb8e205b7a4d48f14fcd801012ac51 (diff) | |
Merge "Add conscrypt updatable certificates." am: 0b62dccbbc am: cd3609306d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2323439
Change-Id: I6113f57c111d1fa56120fd5ae2e0e8938ab5c05c
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