| commit | d6c4d47cf13c52e06e5e75be6e865dfd36441792 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Wed Apr 30 10:27:39 2014 -0700 |
| committer | Nicholas Sauer <nicksauer@google.com> | Wed Apr 30 10:27:39 2014 -0700 |
| tree | c5b6447d389b6d769b891dd64af4b091ea0afc41 | |
| parent | c161d679cb418dc99a789c7f682fa476a034afb2 [diff] | |
| parent | 473b3ecf68e3792af771efa3a15ac36716db0cde [diff] |
resolved conflicts for merge of 473b3ecf to jb-mr1-dev Change-Id: I4734e7f83d7c1221f600646758524ad28f0d3e89
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml index 83e23b6..1c6048d 100644 --- a/apps/CtsVerifier/AndroidManifest.xml +++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -18,7 +18,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.cts.verifier" android:versionCode="1" - android:versionName="4.2_r4"> + android:versionName="4.1_r7"> <!-- Using 10 for more complete NFC support... --> <uses-sdk android:minSdkVersion="10"></uses-sdk>
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 8fb2f15..428b134 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 = "4.2_r2"; + public static final String CTS_BUILD_VERSION = "4.1_r4"; /** * {@inheritDoc}