diff options
| author | Xin Li <delphij@google.com> | 2021-08-13 20:53:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-13 20:53:31 +0000 |
| commit | d2105642ed078fbd8c0f229bc56d392560e18f4e (patch) | |
| tree | 4502a0d3bd8ab0c925726d66f3727bbd80ae67fc | |
| parent | 7c386bb4ef7b33b8e51c7a22911526b311e527f8 (diff) | |
| parent | 725f9cb84f1ac9843ecb25d0477da3ef852b8011 (diff) | |
| download | conscrypt-d2105642ed078fbd8c0f229bc56d392560e18f4e.tar.gz | |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 725f9cb84f -s oursandroid-12.0.0_r32android-12.0.0_r29android-12.0.0_r27android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-release
am skip reason: Merged-In I27a4e230bd0c713d5ba9a3e432dce1be6342a5de with SHA-1 7c386bb4ef is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/conscrypt/+/15546138
Change-Id: I4ecfaadda9450abe4d9a65644efe1cf594cdfc1a
0 files changed, 0 insertions, 0 deletions