commit | c24e62cccc8b608941302cc6a5e400dbd9b0f275 | [log] [tgz] |
---|---|---|
author | Xin Li <[email protected]> | Fri Oct 08 08:30:11 2021 +0000 |
committer | Automerger Merge Worker <[email protected]> | Fri Oct 08 08:30:11 2021 +0000 |
tree | 08497d8a94406b0b6c9ed7845126fbeedcd16cc0 | |
parent | d1ffb240c965cbd7be4da598b31da1a96bba5a78 [diff] | |
parent | 982d540adedd043233d77952dde9c431292c3a84 [diff] |
[automerger skipped] Merge Android 12 am: 5807542208 -s ours am: 92133cae77 -s ours am: c661274424 -s ours am: 982d540ade -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: I8e6c87659db17c18c1037a2b91707e32e026e9f6