tree dd7ec2ed83d5ecc8fecd8912ca3c168a52247a9f
parent 89461623ee2b7c0dc4019c43da575c3adf8497ee
parent c0ade027b6f8ef42722224b9e2f6b73ef3d0aacd
author Xavier Ducrohet <xav@google.com> 1401322082 +0000
committer android-build-merger <android-build-merger@google.com> 1401322082 +0000

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

* commit 'c0ade027b6f8ef42722224b9e2f6b73ef3d0aacd':
  No 64 bit emu on windows.