am 7578e575: Merge change 23155 into donut

Merge commit '7578e57567d63139b563e2a3c6face707beeb931' into eclair

* commit '7578e57567d63139b563e2a3c6face707beeb931':
  Change CTS makefiles so apps are built in data not system partition.
diff --git a/tests/cts/net/Android.mk b/tests/cts/net/Android.mk
index 26188af..d23cee8 100644
--- a/tests/cts/net/Android.mk
+++ b/tests/cts/net/Android.mk
@@ -16,7 +16,10 @@
 
 include $(CLEAR_VARS)
 
+# don't include this package in any target
 LOCAL_MODULE_TAGS := optional
+# and when built explicitly put it in the data partition
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
 LOCAL_JAVA_LIBRARIES := android.test.runner