tree 2ef811e08c39bbff42225db3ed4891b086d2caf1
parent 84fdbd74586478ae0dfcaa5f4cf2554a12a49810
parent 1604cb973e96ede4af275e676f0f35af46641f03
author Calin Juravle <calin@google.com> 1443768304 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443768304 +0000

am 1604cb97: Merge "Fix x86_64 gtest."

* commit '1604cb973e96ede4af275e676f0f35af46641f03':
  Fix x86_64 gtest.