Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5726a83b authored Oct 06, 2016 by Neil Fuller Committed by Android (Google) Code Review Oct 06, 2016

Merge "resolve merge conflicts of 3649f7cb to master"

parents b8af3c20 b0ed2aa0

core/tests/systemproperties/Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@ LOCAL_SRC_FILES := \
		LOCAL_STATIC_JAVA_LIBRARIES := android-common frameworks-core-util-lib
		LOCAL_JAVA_LIBRARIES := android.test.runner
		LOCAL_PACKAGE_NAME := FrameworksCoreSystemPropertiesTests
		LOCAL_JAVA_LANGUAGE_VERSION := 1.8

		LOCAL_CERTIFICATE := platform

media/tests/MediaFrameworkTest/Android.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -7,8 +7,6 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)

		LOCAL_JAVA_LIBRARIES := android.test.runner

		LOCAL_JAVA_LANGUAGE_VERSION := 1.8

		LOCAL_STATIC_JAVA_LIBRARIES := \
		mockito-target-minus-junit4 \
		android-support-test \