| commit | 27a6ba5c2448177637de2a2c68460f6794be6214 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Aug 17 18:36:12 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 17 18:36:12 2021 +0000 |
| tree | cdd2af48218c6260a33265577f5c2a9c58ad40e1 | |
| parent | 87f4cdb82c98414641c01559331257f9c41bdb84 [diff] | |
| parent | f32769cbfb7ef8c04d4ceb169b8b594aabc3d87f [diff] |
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: f32769cbfb -s ours am skip reason: Merged-In Ife187297ea1acc0f5043a13011225bdb92ffc4f5 with SHA-1 87f4cdb82c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/15571921 Change-Id: If0984dbf5263b0d1145cbb7056396ed99305cca7