diff options
author | Xin Li <delphij@google.com> | 2020-09-11 21:28:00 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-11 21:28:00 +0000 |
commit | 1d2715361426c2d039e4a1a804cc2134d699f462 (patch) | |
tree | e1ad9714a372ff8e7c82fa514a436c79bbf3dfc2 | |
parent | 1f2224ef040ce0b241e22f2b9485fd9b713878a0 (diff) | |
parent | 36296d48e1eba5dcb7cb1408c9b0293b452d00dd (diff) | |
download | ca-certificates-1d2715361426c2d039e4a1a804cc2134d699f462.tar.gz |
[automerger skipped] Merge Android R am: 1e336fbf3a -s ours am: 611acf9140 -s ours am: 280beb813f -s ours am: ffcd28debc -s ours am: 36296d48e1 -s ours
am skip reason: Change-Id I5f7f3e51d58b8447db8001bba59af73cc9a6bbf1 with SHA-1 6b1fb51bf9 is in history
Original change: https://android-review.googlesource.com/c/platform/system/ca-certificates/+/1422485
Change-Id: Ida2db201d4d00e8c8881001401631b62a31e1a40
0 files changed, 0 insertions, 0 deletions