| commit | ec6db9f0426bd67911377cacae2e9ed44ae16efb | [log] [tgz] |
|---|---|---|
| author | gitbuildkicker <android-build@google.com> | Wed Mar 22 21:23:29 2017 -0700 |
| committer | gitbuildkicker <android-build@google.com> | Wed Mar 22 21:23:29 2017 -0700 |
| tree | ecfbeda9513d1ba1872bfc424096f1c4e3d1b5d0 | |
| parent | 7b522e129e3d9dea50c7ad23f5aeeea7dffdf076 [diff] | |
| parent | 2f379199dbfa1464ebe74aca781071cd11908411 [diff] |
merge in oc-release history after reset to master
diff --git a/tests/Android.mk b/tests/Android.mk index 851dd5c..667fa4e 100644 --- a/tests/Android.mk +++ b/tests/Android.mk
@@ -24,6 +24,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := RetailDemoTests +LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_STATIC_JAVA_LIBRARIES := android-support-test mockito-target-minus-junit4