commit a453e9f9f16729b2df7c5ebfcc0988746159f18b
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 23 05:50:17 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 23 05:50:17 2016 +0000
tree 1a7f27c71f55a71d4298be50c197705f6edb2708
parent a1e10f686f56074e895118dcb6579a4c36e6e0bc
parent c67662c1535c194ba2db0f5c0e81e7618266024e

Merge "media: update metrics after more measurements" into nyc-dev

device.mk

diff --git a/device.mk b/device.mk
index cae653a..7efaa97 100644
--- a/device.mk
+++ b/device.mk
@@ -91,7 +91,6 @@
     frameworks/native/data/etc/android.hardware.sensor.compass.xml:system/etc/permissions/android.hardware.sensor.compass.xml \
     frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \
     frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
-    frameworks/native/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \
     frameworks/native/data/etc/android.software.midi.xml:system/etc/permissions/android.software.midi.xml \
     frameworks/native/data/etc/android.software.verified_boot.xml:system/etc/permissions/android.software.verified_boot.xml \
     frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:system/etc/permissions/android.hardware.vulkan.level.xml \