commit 1734c7f6017b47f268b571a570b81157bd9e13c4
author Stuart Scott <stuartscott@google.com> Wed Feb 19 17:34:36 2014 -0800
committer Stuart Scott <stuartscott@google.com> Wed Feb 19 17:34:36 2014 -0800
tree 50b7678c3effac77619a541fd4b5a27281e6932d
parent 8a92e1127420d2e4f31a727e5e34007035cd5f0a
parent 995a69d8f53f84167d2728e3167bab6c3ae933fd

resolved conflicts for merge of 995a69d8 to klp-dev

Change-Id: Ib845d7bf8d3473eb544ddb3265cce46def217ce9

CtsTestCaseList.mk

diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index dbf82c9..b98c4e6 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -30,13 +30,14 @@
 	CtsMultiUserStorageApp
 
 cts_support_packages := \
+    CtsAccelerationTestStubs \
+    CtsDeviceAdmin \
     CtsDeviceOpenGl \
     CtsDeviceTaskswitchingAppA \
     CtsDeviceTaskswitchingAppB \
     CtsDeviceTaskswitchingControl \
     CtsDeviceUi \
-    CtsAccelerationTestStubs \
-    CtsDeviceAdmin \
+		CtsHoloDeviceApp \
     CtsMonkeyApp \
     CtsMonkeyApp2 \
     CtsSampleDeviceApp \
@@ -127,10 +128,11 @@
 
 # Host side only tests
 cts_host_libraries := \
-    CtsHostUi \
-    CtsHostJank \
     CtsAdbTests \
     CtsAppSecurityTests \
+		CtsHoloHostTestCases \
+    CtsHostJank \
+    CtsHostUi \
     CtsMonkeyTestCases \
     CtsSampleHostTestCases \
     CtsUsbTests
@@ -164,4 +166,4 @@
 
 
 # The following files will be placed in the tools directory of the CTS distribution
-CTS_TOOLS_LIST :=
\ No newline at end of file
+CTS_TOOLS_LIST :=