resolve merge conflicts of dec157bd6c to master

Bug: None Test: treehugger Change-Id: I701d7a4ee893eb4113a48eaee9930eceec478a29
2019-02-04 10:09:01 -08:00
parent a9ff887f48 dec157bd6c
commit 5e24ba9886
20 changed files with 57 additions and 126 deletions
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -61,7 +61,7 @@ func testConfig(env map[string]string) android.Config {
 		env["ANDROID_JAVA8_HOME"] = "jdk8"
 	}
 	config := android.TestArchConfig(buildDir, env)
-	config.TestProductVariables.DeviceSystemSdkVersions = &[]string{"14", "15"}
+	config.TestProductVariables.DeviceSystemSdkVersions = []string{"14", "15"}
 	return config

 }