tree 264ccb2a6d24c6e0a8f9b0c416e8fea68b451ee2
parent 7ca5d693b6b32d5f3382a2a96e499d6920ba4cc6
parent 352ffc52af68c7f37dc6848f158d66253c11379d
author Elliott Hughes <enh@google.com> 1411531903 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411531903 +0000

am 352ffc52: Merge "Make libcore compile with BoringSSL."

* commit '352ffc52af68c7f37dc6848f158d66253c11379d':
  Make libcore compile with BoringSSL.