diff options
| author | Greg Hackmann <ghackmann@google.com> | 2014-04-02 23:04:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-02 23:04:57 +0000 |
| commit | 0fd37501c4610783c53a6f8d4000ba7a230f61df (patch) | |
| tree | 7864ea72846ec4d85d56b300e638ef0a025ef500 /core/static_test_lib.mk | |
| parent | 0396b10235ece43be797e48673ec05c4cf4c74d7 (diff) | |
| parent | f518e8380cc5d4e1a25ca5fad161a7cd7e7e78dd (diff) | |
| download | build-0fd37501c4610783c53a6f8d4000ba7a230f61df.zip build-0fd37501c4610783c53a6f8d4000ba7a230f61df.tar.gz build-0fd37501c4610783c53a6f8d4000ba7a230f61df.tar.bz2 | |
am f518e838: am f1750876: Merge "Revert "HACK: disable emulator on x86_64""
* commit 'f518e8380cc5d4e1a25ca5fad161a7cd7e7e78dd':
Revert "HACK: disable emulator on x86_64"
Diffstat (limited to 'core/static_test_lib.mk')
0 files changed, 0 insertions, 0 deletions