merge in lmp-mr1-release history after reset to lmp-mr1-dev
diff --git a/common/android-support-test/Android.mk b/common/android-support-test/Android.mk
index 09a6457..59beac0 100644
--- a/common/android-support-test/Android.mk
+++ b/common/android-support-test/Android.mk
@@ -14,6 +14,7 @@
LOCAL_PATH:= $(call my-dir)
+# for Andoird JUnit runner
include $(CLEAR_VARS)
LOCAL_MODULE := android-support-test
@@ -24,3 +25,12 @@
include $(BUILD_PREBUILT)
+# for espresso
+include $(CLEAR_VARS)
+LOCAL_MODULE := espresso-core
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := espresso-core.jar
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
+
+include $(BUILD_PREBUILT)
diff --git a/common/android-support-test/PREBUILT b/common/android-support-test/PREBUILT
index 326e4e5..c7f6b4e 100644
--- a/common/android-support-test/PREBUILT
+++ b/common/android-support-test/PREBUILT
@@ -1,4 +1,4 @@
The object in this prebuilt directory can be rebuilt from
platform/frameworks/testing/support
-From the revision 4d1b19708272ba0597d48e4ce7cf5415da11933e
+From the revision 89ba275204f98e5f7283bbda53d20c99225fe995
diff --git a/common/android-support-test/build.gradle b/common/android-support-test/build.gradle
index 4eae124..eb9d8bd 100644
--- a/common/android-support-test/build.gradle
+++ b/common/android-support-test/build.gradle
@@ -1,2 +1,3 @@
// allow other projects to directly use 'android-support-test.jar'
artifacts.add("default", file('android-support-test.jar'))
+artifacts.add("default", file('espresso-core.jar'))
diff --git a/common/android-support-test/espresso-core.jar b/common/android-support-test/espresso-core.jar
new file mode 100644
index 0000000..482c456
--- /dev/null
+++ b/common/android-support-test/espresso-core.jar
Binary files differ
diff --git a/common/icu4j/PREBUILT b/common/icu4j/PREBUILT
index 813418a..c145bc6 100644
--- a/common/icu4j/PREBUILT
+++ b/common/icu4j/PREBUILT
@@ -1,4 +1,4 @@
The objects in this prebuilt directory can be rebuilt
using the source archive hosted at
-http://download.icu-project.org/files/icu4j/50.1.1/icu4j-50_1_1.tgz
+http://download.icu-project.org/files/icu4j/53.1/icu4j-53_1.tgz
diff --git a/common/icu4j/icu4j.jar b/common/icu4j/icu4j.jar
index ac6fa6e..2c3ff8b 100644
--- a/common/icu4j/icu4j.jar
+++ b/common/icu4j/icu4j.jar
Binary files differ
