| commit | b0ed2aa01b15b936188861bb886d5e40a9701947 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Thu Oct 06 11:23:06 2016 +0100 |
| committer | Neil Fuller <nfuller@google.com> | Thu Oct 06 11:23:06 2016 +0100 |
| tree | f8415c0dbaff2d31ad4f97fa0641e6da06693605 | |
| parent | 7e78a0e3ae4c5b17a8fd3cb7f8bb8923f9f3d10f [diff] | |
| parent | 3649f7cb7040fb2cb5596054dd7f741538e2db1f [diff] |
resolve merge conflicts of 3649f7c to master Change-Id: Ic16950f1c50f7d06d3c9ae08a6f28e292b89c20f
diff --git a/core/tests/systemproperties/Android.mk b/core/tests/systemproperties/Android.mk index ffc1282..e16c367 100644 --- a/core/tests/systemproperties/Android.mk +++ b/core/tests/systemproperties/Android.mk
@@ -11,7 +11,6 @@ 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
diff --git a/media/tests/MediaFrameworkTest/Android.mk b/media/tests/MediaFrameworkTest/Android.mk index 20575e0..308c665 100644 --- a/media/tests/MediaFrameworkTest/Android.mk +++ b/media/tests/MediaFrameworkTest/Android.mk
@@ -7,8 +7,6 @@ LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_JAVA_LANGUAGE_VERSION := 1.8 - LOCAL_STATIC_JAVA_LIBRARIES := \ mockito-target-minus-junit4 \ android-support-test \