commit 62a97bf41245d8074d4169326ea1fa35c243ee3c
author Agatha Man <agathaman@google.com> Tue Jul 14 13:47:47 2015 -0700
committer Agatha Man <agathaman@google.com> Mon Jul 27 15:28:55 2015 -0700
tree 4e349c7fdc84e2b40546dd013fafe4f80439fb79
parent 38806a81a80a707c55401122a8e490e2e8063f33

DO NOT MERGE Added GenericDeviceInfo Collector

Other changes included
- Added dependencies to regenerate manifest.xml (see device_info_package.mk).
- Removed SampleDeviceInfo collector from CtsDeviceInfo apk
- Added CtsDeviceInfo to CtsTestCaseList.mk

Change-Id: I0bb393a1ec8df65572361799f02c686601402668

CtsTestCaseList.mk

diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index 0d6eac8..5042a74 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -78,6 +78,7 @@
     CtsDeviceOpenGl \
     CtsWifiConfigCreator \
     CtsDeviceAndProfileOwnerApp \
+    CtsDeviceInfo \
     CtsDeviceOwnerApp \
     CtsDeviceTaskswitchingAppA \
     CtsDeviceTaskswitchingAppB \