| commit | f3eb744d8981132bc002f927993d750c9ae717c6 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Thu May 07 15:30:26 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 07 15:30:26 2020 +0000 |
| tree | a8943b47314331decc61b6e90e8d23c5a03a64d2 | |
| parent | b8d7478f6cc04b4d26bf7052e0a7df6cc5184405 [diff] | |
| parent | b09d7cfb73c154b53aef5a3ff986c98ab864c4f0 [diff] |
[automerger skipped] Merge "Move conscrypt from the set of non-updatable APIs" am: d28224cf8a am: b09d7cfb73 -s ours am skip reason: Change-Id Iacfcc3a789cb42a73cc4b4c89a215db0ea09800f with SHA-1 e89d37d6d8 is in history Change-Id: Ia9521135c680c69b82e8e91e8808f77f044514b6