tree 7493be0a81c9597d0d7d43e98547ea67ff1a0ae2
parent fb11df081e52fc44c8e31a9be2fb547e5ee2da56
parent 1b1aea22c0cc5567b5967590cb3f949cc45c3a9a
author Brian Carlstrom <bdc@google.com> 1401123622 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401123622 +0000

am 1b1aea22: Merge "Fix x86_64 test failures."

* commit '1b1aea22c0cc5567b5967590cb3f949cc45c3a9a':
  Fix x86_64 test failures.