commit f60f95391262f2295b9173e23a9344c8322d604a
author The Android Automerger <android-build@android.com> Fri May 13 14:27:33 2011 -0700
committer The Android Automerger <android-build@android.com> Fri May 13 14:27:33 2011 -0700
tree 28ef507704dc5bcf4c18013ed3421e241241487e
parent 3ef19fa91771be93f398af577a4432bb0fd571aa
parent 51c57d3ae32e06946cfa27ce857d7f08a08954c5

merge in gingerbread-release history after reset to gingerbread

testrunner/test_defs.xml

diff --git a/testrunner/test_defs.xml b/testrunner/test_defs.xml
index f83d32d..17a3694 100644
--- a/testrunner/test_defs.xml
+++ b/testrunner/test_defs.xml
@@ -218,6 +218,12 @@
     coverage_target="framework"
     suite="cts" />
 
+<test name="cts-security"
+    build_path="cts/tests/tests/security"
+    package="com.android.cts.security"
+    runner="android.test.InstrumentationCtsTestRunner"
+    suite="cts" />
+
 <test name="cts-api-signature"
     build_path="cts/tests/SignatureTest"
     package="android.tests.sigtest"