| commit | 028ae60220f942b62b0f2a6bec271861e180e094 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Thu Oct 01 12:32:08 2015 -0700 |
| committer | The Android Automerger <android-build@android.com> | Thu Oct 01 15:44:26 2015 -0700 |
| tree | d3106a6e9cc72e42571902c5e2434949b193decf | |
| parent | fba49b66775340a1dbc233051ef7f5eed306788d [diff] |
DO NOT MERGE CTS version is now 6.0_r1 Bug: 21208382 Change-Id: If19708405d706ac974d8199e1ccafc40dd590a78
diff --git a/apps/CtsVerifier/Android.mk b/apps/CtsVerifier/Android.mk index 8cec7ea..34246cc 100644 --- a/apps/CtsVerifier/Android.mk +++ b/apps/CtsVerifier/Android.mk
@@ -41,7 +41,7 @@ LOCAL_PACKAGE_NAME := CtsVerifier -LOCAL_AAPT_FLAGS += --version-name "6.0_r0 $(BUILD_NUMBER)" +LOCAL_AAPT_FLAGS += --version-name "6.0_r1 $(BUILD_NUMBER)" LOCAL_JNI_SHARED_LIBRARIES := libctsverifier_jni libaudioloopback_jni
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java b/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java index fa930df..782e6ab 100644 --- a/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java +++ b/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
@@ -31,7 +31,7 @@ @Option(name="cts-install-path", description="the path to the cts installation to use") private String mCtsRootDirPath = System.getProperty("CTS_ROOT"); - public static final String CTS_BUILD_VERSION = "6.0_r0"; + public static final String CTS_BUILD_VERSION = "6.0_r1"; public static final String CTS_PACKAGE = "com.android.cts.tradefed.testtype"; /**