tree dd7ec2ed83d5ecc8fecd8912ca3c168a52247a9f
parent 41f48b6195d7a35a1726a544071a1064d45026b0
parent 7941ac1e50b7abfcc525b1be5d581be08119b6e0
author Xavier Ducrohet <xav@google.com> 1401322298 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401322298 +0000

am 7941ac1e: Merge "No 64 bit emu on windows." into idea133 automerge: c0ade02

* commit '7941ac1e50b7abfcc525b1be5d581be08119b6e0':
  No 64 bit emu on windows.