| commit | 9d0ccd4417c1b2e1a24d34504ee23e25725756b2 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Wed Jan 23 01:22:40 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jan 23 01:22:40 2019 -0800 |
| tree | cc4f5fb29fecfb05aae088ef38daacaf9823feea | |
| parent | 3c1550d2151cb94473437d7a0d096e90c509441d [diff] | |
| parent | b7fb2f7173f5ea005bcba5568c73cd0809a869ff [diff] |
Merge "Conscrypt should only link against bionic." am: 1cab2c6bec am: 31e937429c Change-Id: Ifdc863fc41d3d91d52746ac3a5387f35e6408c37