merge in nyc-release history after reset to nyc-dev

diff --git a/tests/binder/benchmarks/Android.mk b/tests/binder/benchmarks/Android.mk
index 2a537cf..fa7629c 100644 (file)
--- a/tests/binder/benchmarks/Android.mk
+++ b/tests/binder/benchmarks/Android.mk
@@ -20,7 +20,6 @@ include $(CLEAR_VARS)
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 LOCAL_MODULE_TAGS := eng tests
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativebenchmark
 
 LOCAL_STATIC_LIBRARIES += \
     libtestUtil