| commit | 267afcdefe3a6da9b72a9c70d238abb00be69949 | [log] [tgz] |
|---|---|---|
| author | Greg Hackmann <ghackmann@google.com> | Tue Mar 18 19:21:48 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Mar 18 19:21:49 2014 +0000 |
| tree | 90bec7943aedcee8f8a486dc3e9f3fcc504bfe24 | |
| parent | 255ea2bdc45673b7d08809f4495f060b00006c6e [diff] | |
| parent | 4562c5bcb355c87a18e811ba8e6c2b6451a3ebf7 [diff] |
Merge "HACK: disable emulator on x86_64"
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index f192c0b..4c403b4 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk
@@ -74,7 +74,6 @@ LOCAL_DROIDDOC_OPTIONS:= LOCAL_DROIDDOC_HTML_DIR:= LOCAL_ADDITIONAL_HTML_DIR:= -LOCAL_ASSET_FILES:= LOCAL_ASSET_DIR:= LOCAL_RESOURCE_DIR:= LOCAL_JAVA_RESOURCE_DIRS:=