tree f9df2b79c4763f968c663f615ef1c9e8512a5655
parent 78b946e637f644ee56a6f61267ad01c35538d78d
parent 50d79cc8efd993b3c5ea4b393c6d56d5a2f4890b
author Yongqin Liu <yongqin.liu@linaro.org> 1512154071 +0000
committer android-build-merger <android-build-merger@google.com> 1512154071 +0000

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

Change-Id: I4d3f41ab585885b05ae4d1fa9cb560c827c9627a