commit 67871699b695928c285a2d5c536c8903465652b3
author Christopher Dombroski <cdombroski@google.com> Thu Aug 30 14:46:00 2018 -0700
committer Christopher Dombroski <cdombroski@google.com> Fri Aug 31 18:40:41 2018 +0000
tree e8aa3c1d9145aee03be4f8bad60c56d66eb2fdca
parent 519414de769f43d968dd8acb255edeefc6b848d0

Clean up AndroidTest.xml so that tests can merge easier

Bug: 113680154
Test: None

Change-Id: I6109f56ccb81484ef633625b8a884ae85f34a22b

hostsidetests/security/AndroidTest.xml

diff --git a/hostsidetests/security/AndroidTest.xml b/hostsidetests/security/AndroidTest.xml
index 36ee65d..a5ee3c7 100755
--- a/hostsidetests/security/AndroidTest.xml
+++ b/hostsidetests/security/AndroidTest.xml
@@ -143,6 +143,10 @@
         <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
 
         <!--__________________-->
+        <!-- Bulletin 2018-01 -->
+        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
+
+        <!--__________________-->
         <!-- Bulletin 2018-02 -->
         <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
         <option name="push" value="CVE-2017-13273->/data/local/tmp/CVE-2017-13273" />
@@ -152,6 +156,7 @@
 
         <option name="append-bitness" value="true" />
     </target_preparer>
+
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsSecurityHostTestCases.jar" />
         <option name="runtime-hint" value="4m2s" />