tree 921d9be8599e7b24bca120a5e89df893f136ac49
parent 2b892c2e57cabed4bf84661770eba7d70e80088e
parent 65c69837295af8f114f03897163ae24ab5e0ff71
author Greg Hackmann <ghackmann@google.com> 1401399701 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401399701 +0000

am 65c69837: Fix x86_64 build

* commit '65c69837295af8f114f03897163ae24ab5e0ff71':
  Fix x86_64 build