Merge "First stab at a sample voice recognition service to show the skeleton for...

diff --git a/build/sdk.atree b/build/sdk.atree
index f3bd0c6..a9226ce 100644 (file)
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -143,7 +143,7 @@ framework/swing-worker-1.1.jar tools/lib/swing-worker-1.1.jar
 bin/layoutopt tools/layoutopt
 framework/layoutopt.jar tools/lib/layoutopt.jar
 framework/uix.jar tools/lib/uix.jar
-framework/groovy-all-1.6.5.jar tools/lib/groovy-all-1.6.5.jar
+framework/groovy-all-1.7.0.jar tools/lib/groovy-all-1.7.0.jar
 
 # traceview
 bin/traceview tools/traceview

diff --git a/samples/ApiDemos/res/xml/device_admin_sample.xml b/samples/ApiDemos/res/xml/device_admin_sample.xml
index bfd6c5f..7158003 100644 (file)
--- a/samples/ApiDemos/res/xml/device_admin_sample.xml
+++ b/samples/ApiDemos/res/xml/device_admin_sample.xml
@@ -20,7 +20,6 @@
         <limit-password />
         <watch-login />
         <reset-password />
-        <limit-unlock />
         <force-lock />
         <wipe-data />
     </uses-policies>