refs/heads/android15-qpr1-s4-release - platform/prebuilts/module_sdk/conscrypt

commit: 1fe3445c0fcac5ab0019e433b67e79a89ad035b8
[log]
author: Android Build Coastguard Worker <[email protected]>
Thu Oct 17 22:54:25 2024 +0000
committer: Android Build Coastguard Worker <[email protected]>
Thu Oct 17 22:54:25 2024 +0000
tree: 922c462eded8f6e2260612faa785627b05d9bc06
parent: ed21f371d3b250c38d11294cb10219ebd31a30d5 [diff]
parent: 1575330f76d44e8621db3c07309b64019ed50c25 [diff]

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29780098', 'googleplex-android-review.googlesource.com/29908883'] into 24Q4-release.

Change-Id: I3966cc3f70c37ef7ca328ea82dc84212d8e194b2

tree: 922c462eded8f6e2260612faa785627b05d9bc06

.prebuilt_info/
1/
13/
3/
7/
current/
OWNERS