commit | f18b4eae50ca8cb3940f0fa68c48197463dff8df | [log] [tgz] |
---|---|---|
author | Alex Klyubin <klyubin@google.com> | Tue May 09 21:24:05 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue May 09 21:24:05 2017 +0000 |
tree | 07587c57ed68fe589392abd24e76cb89610a31f3 | |
parent | e4cc75de2c908d8077a240396c0c4807ddefa89a [diff] | |
parent | 473e674143dd48c39bbed4dfd4d25c5971c56318 [diff] |
Merge "Merge "Switch from libcrypto_static to libcrypto target" am: 4ad5256547 am: 44eb369c83" into nyc-mr2-dev-plus-aosp am: 473e674143 Change-Id: I25e54403e7d41e5e897654ce71e6919d48503a1f