| commit | 55e5a82ccdde2d6ff4d02831f25d8109710a43fe | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Nov 17 10:20:51 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 17 10:20:51 2021 +0000 |
| tree | 8450c0754222816f8a602b0959f5b647a5be7bba | |
| parent | b4f55c1458ae9c6f39ffd34814221eacc9555c64 [diff] | |
| parent | 7236337172e9ffd24471091746f60cf13ec67dc1 [diff] |
[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 4d71a36589 -s ours am: bc86741f74 -s ours am: 7236337172 -s ours am skip reason: Merged-In Ic8aa998eaea5817b05635c43341d6a349c1b767d with SHA-1 db5d1fba04 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/16279619 Change-Id: I246a1dcb5605659000f87c93843350c071abdd7e