| commit | 979e8de2ccb5e59251aae8b492bb11faaa40f2a5 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Wed Jan 23 01:30:49 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jan 23 01:30:49 2019 -0800 |
| tree | 8a9c60f5d1e3c22379819d29d8f80f6d1c1c16e8 | |
| parent | bab70b7a8649842c7f254ce05c9165db011f1823 [diff] | |
| parent | 9d0ccd4417c1b2e1a24d34504ee23e25725756b2 [diff] |
Merge "Conscrypt should only link against bionic." am: 1cab2c6bec am: 31e937429c am: 06710823aa Change-Id: Ic884d79df46b625e78f1b0bda03a368322bcef50