Merge from gingerbread

Change-Id: I85fd33e5db2744f78166b3d879e9e664a06653e3
2011-06-01 14:12:16 -07:00
parent 8821d5a56e 3ef19fa917
commit fc618484ab
1 changed files with 6 additions and 0 deletions
--- a/testrunner/test_defs.xml
+++ b/testrunner/test_defs.xml
@@ -218,6 +218,12 @@ See test_defs.xsd for more information.
    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"