commit 47d0e04e5909f9558db64a27de97d41a4ee76498
author Daniel Xie <dxie@google.com> Wed Jun 03 07:08:45 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 03 07:08:45 2015 +0000
tree 7eafaabf0d3e836bffcff4d47404c1f228ea71fd
parent 3557697903ccd7058d4ff45e48d756247823edc4
parent dd9d85838e5b8e378ef722c0058926774a6719fc

am dd9d8583: am 4dd7fbee: am c688aa62: am efef9855: am 4053a34a: Merge "resolve merge conflicts of 6176421 to lollipop-cts-dev." into lollipop-cts-dev automerge: 6c78c8e

* commit 'dd9d85838e5b8e378ef722c0058926774a6719fc':
  Fix for CTS fail android.hardware.cts.SensorTest#testSensorOperations

tests/tests/app/AndroidManifest.xml

diff --git a/tests/tests/app/AndroidManifest.xml b/tests/tests/app/AndroidManifest.xml
index 08b0dda..7c09cd2 100644
--- a/tests/tests/app/AndroidManifest.xml
+++ b/tests/tests/app/AndroidManifest.xml
@@ -19,7 +19,7 @@
     package="com.android.cts.app">
 
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
-
+    <uses-permission android:name="android.permission.BODY_SENSORS" />
     <application>
         <uses-library android:name="android.test.runner" />
     </application>