tree 5c09df156e76f2fd67f9b15b8fe5edaba0d5dd7c
parent 4c4323254e7fa8887283f9cfcbc059785f78284b
parent e6a4195bf7738ea215e74714c49040efef8fa0d6
author Josh Gao <jmgao@google.com> 1470681560 +0000
committer android-build-merger <android-build-merger@google.com> 1470681560 +0000

Merge "Fix references to libcrypto_utils_static." am: b97da5e0f0 am: dc97404346
am: e6a4195bf7

Change-Id: Ib497de2a8e38d60cf6be058de919bd8f5e5871cb