Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
halo
cts
Commits
0fbdf440
Commit
0fbdf440
authored
9 years ago
by
Daniel Xie
Committed by
Gerrit Code Review
9 years ago
Browse files
Options
Download
Plain Diff
Merge "DO NOT MERGE ANYWHERE: Bump CTS 5.0 to R5" into lollipop-cts-release
parents
74ef27c9
4147aa77
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
apps/CtsVerifier/AndroidManifest.xml
apps/CtsVerifier/AndroidManifest.xml
+1
-1
tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
.../src/com/android/cts/tradefed/build/CtsBuildProvider.java
+1
-1
No files found.
apps/CtsVerifier/AndroidManifest.xml
View file @
0fbdf440
...
...
@@ -18,7 +18,7 @@
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"com.android.cts.verifier"
android:versionCode=
"5"
android:versionName=
"5.0_r
4
"
>
android:versionName=
"5.0_r
5
"
>
<uses-sdk
android:minSdkVersion=
"19"
android:targetSdkVersion=
"21"
/>
...
...
This diff is collapsed.
Click to expand it.
tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
View file @
0fbdf440
...
...
@@ -31,7 +31,7 @@ public class CtsBuildProvider implements IBuildProvider {
@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
=
"5.0_r
4
"
;
public
static
final
String
CTS_BUILD_VERSION
=
"5.0_r
5
"
;
/**
* {@inheritDoc}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment