commit d6fb55684e67e12b750ee93f54181d5d48509f13
author Yongqin Liu <yongqin.liu@linaro.org> Fri Dec 01 18:47:51 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 01 18:47:51 2017 +0000
tree f9df2b79c4763f968c663f615ef1c9e8512a5655
parent 78b946e637f644ee56a6f61267ad01c35538d78d
parent 50d79cc8efd993b3c5ea4b393c6d56d5a2f4890b

Merge "device-common.mk: add support for feature android.software.voice_recognizers" am: ec28edb95a
am: 50d79cc8ef

Change-Id: I4d3f41ab585885b05ae4d1fa9cb560c827c9627a

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 3443b05..18b6282 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -151,6 +151,7 @@
         frameworks/native/data/etc/android.software.cts.xml:system/etc/permissions/android.software.cts.xml \
         frameworks/native/data/etc/android.software.app_widgets.xml:system/etc/permissions/android.software.app_widgets.xml \
         frameworks/native/data/etc/android.software.backup.xml:system/etc/permissions/android.software.backup.xml \
+        frameworks/native/data/etc/android.software.voice_recognizers.xml:system/etc/permissions/android.software.voice_recognizers.xml \
         frameworks/native/data/etc/android.hardware.ethernet.xml:system/etc/permissions/android.hardware.ethernet.xml \
         frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
         frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \