Merge "SWIG binaries for Windows."
diff --git a/common/ddmlib/Android.mk b/common/ddmlib/Android.mk
index 5ddfaef..f0361e3 100644
--- a/common/ddmlib/Android.mk
+++ b/common/ddmlib/Android.mk
@@ -7,6 +7,7 @@
LOCAL_SRC_FILES := ddmlib-prebuilt.jar
LOCAL_IS_HOST_MODULE := true
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_BUILT_MODULE_STEM := javalib.jar
LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
include $(BUILD_PREBUILT)
diff --git a/common/tradefed/PREBUILT b/common/tradefed/PREBUILT
index a3c5515..e39f59e 100644
--- a/common/tradefed/PREBUILT
+++ b/common/tradefed/PREBUILT
@@ -1,4 +1,4 @@
The object in this prebuilt directory can be rebuilt from
platform/tools/tradefederation
-From the revision 5df1d54369543388c55a83bbf180cb36bd2fb6b2
+From the revision 3ea8bb8dd6e3a2411e9270c38edbd53445601ca4
diff --git a/common/tradefed/tradefed-prebuilt.jar b/common/tradefed/tradefed-prebuilt.jar
index 8e9a7bd..e2df006 100644
--- a/common/tradefed/tradefed-prebuilt.jar
+++ b/common/tradefed/tradefed-prebuilt.jar
Binary files differ