commit 100f99d625909fd17a722a0ed0148549afd55cf8
author Jean-Baptiste Queru <jbq@google.com> Wed Apr 13 11:49:19 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 13 11:49:19 2011 -0700
tree 8ff46ca94161328683722aad9718dab20487a1f2
parent 144058df70ad9a13f3897d3734f55a1517b9d7f7
parent 28fc4830fdc68db134783955cc9f54f32d35b0fd

am 28fc4830: Merge "Cleanup leftover merge conflict"

* commit '28fc4830fdc68db134783955cc9f54f32d35b0fd':
  Cleanup leftover merge conflict

Android.mk

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)