am 28fc4830: Merge "Cleanup leftover merge conflict"
* commit '28fc4830fdc68db134783955cc9f54f32d35b0fd':
Cleanup leftover merge conflict
diff --git a/Android.mk b/Android.mk
index 03d1c78..b83694d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,7 +22,7 @@
include $(BUILD_STATIC_JAVA_LIBRARY)
# Include this library in the build server's output directory
-$(call dist-for-goals, droid, $(LOCAL_BUILT_MODULE):jsr305.jar)
+$(call dist-for-goals, dist_files, $(LOCAL_BUILT_MODULE):jsr305.jar)
# Also build a host side library
include $(CLEAR_VARS)