commit 48441fde525a074dd2cffa6079201dbd6d61df14
author Unsuk Jung <unsuk@google.com> Mon Sep 08 16:14:29 2014 -0700
committer Unsuk Jung <unsuk@google.com> Mon Sep 08 16:14:29 2014 -0700
tree 212d5a89ee957450210c4b8888a3d02917f237d0
parent fb81f54192d296d207480fd90cb8e8ad8f6f5daf
parent e5fc06e9035a0e50991cb4382e1c02eeec6f7ee9

resolved conflicts for merge of e5fc06e9 to klp-modular-dev

Conflicts:
	tests/tests/accessibilityservice/AndroidManifest.xml

Change-Id: Icd9e754a2c79f9436379219736492f5e9cf6c538

tests/tests/accessibilityservice/AndroidManifest.xml

diff --git a/tests/tests/accessibilityservice/AndroidManifest.xml b/tests/tests/accessibilityservice/AndroidManifest.xml
index ed94f9c..13c44b5 100644
--- a/tests/tests/accessibilityservice/AndroidManifest.xml
+++ b/tests/tests/accessibilityservice/AndroidManifest.xml
@@ -19,8 +19,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.android.cts.accessibilityservice">
 
-  <uses-sdk android:minSdkVersion="18"
-          android:targetSdkVersion="18" />
+  <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
 
   <application android:theme="@android:style/Theme.Holo.NoActionBar" >