commit | 36296d48e1eba5dcb7cb1408c9b0293b452d00dd | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:30 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:30 2020 +0000 |
tree | e1ad9714a372ff8e7c82fa514a436c79bbf3dfc2 | |
parent | 1852495c50a633a4e41177589699d23e99a0b65f [diff] | |
parent | ffcd28debc250b3c7a35a71ba0018595e2697bde [diff] |
[automerger skipped] Merge Android R am: 1e336fbf3a -s ours am: 611acf9140 -s ours am: 280beb813f -s ours am: ffcd28debc -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: Ib73003b422730a95b9dd422da0eb55573eab216e