| commit | b7fb2f7173f5ea005bcba5568c73cd0809a869ff | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Wed Jan 23 01:18:47 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jan 23 01:18:47 2019 -0800 |
| tree | adfd00e6e297f249abfc45a8f93c7e98bc2b30a8 | |
| parent | a1c53fb3f677f41ae2d54b08fd2b7d69515b4e1f [diff] | |
| parent | fc3449f2f1f80ccde568cab6068acd9830de1b85 [diff] |
Merge "Conscrypt should only link against bionic." am: 1cab2c6bec Change-Id: I8ee133fed8bbf6f87c90680da91ffa018c49fcba