summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author ThiƩbaud Weksteen <tweek@google.com> 2024-12-19 17:13:38 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-12-19 17:13:38 -0800
commit82f99db87c4560fd754a963df027640241fb1961 (patch)
treebd9373bce63be00c2d8cd78ee21eff061181a613 /libs/androidfw/AssetsProvider.cpp
parent34e73d74031fb909599edf0ceac0a0f7cbf67696 (diff)
parentd068a0c09228993a3593f84e564933f2092e9bfb (diff)
Merge "Add checkServerTrusted with OCSP and TlsData parameters to RootTrustManager" into main am: d068a0c092
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3425399 Change-Id: Ife9544b8fde324514227036d4099a2b0e55cfb52 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions