tree e65333fe2c95343333168513ffa663fdb7a6ec50
parent 1e324fa459401d1435c2fc910307735dd9ec449c
parent dc974043460cb5eb7bafa06510d95e203f656af2
author Josh Gao <jmgao@google.com> 1470681376 +0000
committer android-build-merger <android-build-merger@google.com> 1470681376 +0000

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

Change-Id: Ica1f4616c87c81e24b7e4b2dfa0778557dae4a6a