commit 83139f4c6f96c07f963b0683276e3b84fc09d87d
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 09 23:22:56 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 09 23:22:56 2019 +0000
tree 4466ebc643aa566268a358141b23ec423fd7eb6b
parent 7b7f7eb47b0bbf802b84d854270eab42298c6c56
parent fd4caf79cce428ea0c1708e447ae55b2eaa55c49

Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r29" into nougat-mr1-cts-dev

apps/CtsVerifier/AndroidManifest.xml

diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index aeaddc9..9e85242 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="5"
-      android:versionName="7.1_r28">
+      android:versionName="7.1_r29">
 
     <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="25"/>
 

tools/cts-tradefed/Android.mk

diff --git a/tools/cts-tradefed/Android.mk b/tools/cts-tradefed/Android.mk
index 540d0a4..f046f77 100644
--- a/tools/cts-tradefed/Android.mk
+++ b/tools/cts-tradefed/Android.mk
@@ -25,7 +25,7 @@
 LOCAL_SUITE_TARGET_ARCH := $(TARGET_ARCH)
 LOCAL_SUITE_NAME := CTS
 LOCAL_SUITE_FULLNAME := "Compatibility Test Suite"
-LOCAL_SUITE_VERSION := 7.1_r28
+LOCAL_SUITE_VERSION := 7.1_r29
 
 LOCAL_MODULE := cts-tradefed