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"