tree 0e00ee87b69d6b60bbc8a12241f5a2bfeae82b06
parent 1f2ab38aa1aa8c1310033953d486e4fa5bd0146b
parent 13802114b8683a097fbecd42a1a07d39619a8a4e
author Brian Carlstrom <bdc@google.com> 1347494573 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347494573 -0700

am 13802114: am 945555bc: am 591d8daf: Merge "Enable openssl crypto optimizations for x86 platform"

* commit '13802114b8683a097fbecd42a1a07d39619a8a4e':
  Enable openssl crypto optimizations for x86 platform