commit 05e21a6e14151f9a8acb80144b7affc70637a918
author Keun young Park <keunyoung@google.com> Fri Jul 13 10:13:20 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 13 10:13:20 2012 -0700
tree 9dab5f86584e66700c70bfe02e4b8e6d21f87910
parent 632ca56c0485abc916a80055c52ba5c2cfad0129
parent 0c6092e9c03aee494e1d52ec2d3dbbcd89a98298

am 0c6092e9: am 553a096b: Merge "remove keyguard permission" into jb-dev

* commit '0c6092e9c03aee494e1d52ec2d3dbbcd89a98298':
  remove keyguard permission

tests/tests/permission/AndroidManifest.xml

diff --git a/tests/tests/permission/AndroidManifest.xml b/tests/tests/permission/AndroidManifest.xml
index 840bbf3..1e1465d 100644
--- a/tests/tests/permission/AndroidManifest.xml
+++ b/tests/tests/permission/AndroidManifest.xml
@@ -18,7 +18,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.cts.permission">
 
-    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <application>
         <uses-library android:name="android.test.runner" />
         <activity android:name="android.permission.cts.PermissionStubActivity"