tree 5b237fe75eabde633cb4b0c3384b74fddbeda4dc
parent 0f99bb3d0bb358e79be85b54823792ec2c198b8b
parent 8d3b9c9e456e1d62a025d2eb3a03f2566823d2e3
author Narayan Kamath <narayan@google.com> 1401189357 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401189357 +0000

am 8d3b9c9e: Merge "Switch x86_64 emulator to 64 bit primary."

* commit '8d3b9c9e456e1d62a025d2eb3a03f2566823d2e3':
  Switch x86_64 emulator to 64 bit primary.