[automerger] Add bounds checking for transparency lookup am: 53f97a2dd6 am: f171582d41 am: 7c096751ec am: 964b4bc316 am: 1e74900d02 am: cdb13addd3 am: a9b1c97298 am: 5cef228075 am: 98a14c56a8 am: a5ed4c7ef4 am: 7226042d2a am: 6b2d056043 am: 24f183e9b7
am: f4c429cda5
Change-Id: I980a3ccd194ad39ebba6fc174d215cb6140a84b8
diff --git a/common/tests/Android.mk b/common/tests/Android.mk
index 58ba01b..42ea168 100644
--- a/common/tests/Android.mk
+++ b/common/tests/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
LOCAL_CERTIFICATE := platform
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
LOCAL_MODULE_TAGS := tests
LOCAL_PACKAGE_NAME := AndroidCommonTests
LOCAL_SDK_VERSION := 8
diff --git a/framesequence/Android.mk b/framesequence/Android.mk
index 1b3cf2d..dbe47ea 100644
--- a/framesequence/Android.mk
+++ b/framesequence/Android.mk
@@ -25,4 +25,4 @@
include $(BUILD_STATIC_JAVA_LIBRARY)
-include $(call all-makefiles-under, $(LOCAL_PATH))
+include $(call first-makefiles-under, $(LOCAL_PATH))