| commit | 81806140db1ec0565bec6fa5f8365c06637b6213 | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Fri Oct 08 09:00:21 2021 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Fri Oct 08 09:00:21 2021 +0000 |
| tree | 08497d8a94406b0b6c9ed7845126fbeedcd16cc0 | |
| parent | 917ace36916a1240cf87670f8b6d2885d805b305 [diff] | |
| parent | c24e62cccc8b608941302cc6a5e400dbd9b0f275 [diff] |
[automerger skipped] Merge Android 12 am: 5807542208 -s ours am: 92133cae77 -s ours am: c661274424 -s ours am: 982d540ade -s ours am: c24e62cccc -s ours am skip reason: Merged-In I5858ea02ccf1ff6e74acb641c37d2733b9c5bc18 with SHA-1 c209a5602f is already in history Original change: https://android-review.googlesource.com/c/platform/system/ca-certificates/+/1847916 Change-Id: Ia01549cd9a7e43abe77ccde8854534e163739575