commit | a7a813e88a24d21e391c6a32da447a737deba602 | [log] [tgz] |
---|---|---|
author | Xavier Ducrohet <xav@google.com> | Thu May 29 00:11:38 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 29 00:11:38 2014 +0000 |
tree | dd7ec2ed83d5ecc8fecd8912ca3c168a52247a9f | |
parent | 41f48b6195d7a35a1726a544071a1064d45026b0 [diff] | |
parent | 7941ac1e50b7abfcc525b1be5d581be08119b6e0 [diff] |
am 7941ac1e: Merge "No 64 bit emu on windows." into idea133 automerge: c0ade02 * commit '7941ac1e50b7abfcc525b1be5d581be08119b6e0': No 64 bit emu on windows.