commit dd1c462b7b56ee16d0df7effba4217ff8d60a30f
author Daniel Xie <dxie@google.com> Fri Jun 05 02:27:18 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 05 02:27:18 2015 +0000
tree f807464b088a507801c3372c6f1881a8f95cffae
parent 75ffc557a6acd53d262e852cfea0a7ce52680551
parent 47d0e04e5909f9558db64a27de97d41a4ee76498

am 47d0e04e: 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 '47d0e04e5909f9558db64a27de97d41a4ee76498':
  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 231727f..8e17396 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" />
         <uses-library android:name="org.apache.http.legacy" android:required="false" />