am 519cc65d: am 7d9fdd1e: Merge "Issue #17551667: Voice interaction service should be disabled..." into lmp-mr1-dev

* commit '519cc65dd84f04c9078d70fb06c01fb63357ae93':
  Issue #17551667: Voice interaction service should be disabled...
This commit is contained in:
Dianne Hackborn 2014-11-17 20:26:12 +00:00 committed by Android Git Automerger
commit 97e61fcf88
2 changed files with 2 additions and 2 deletions

View File

@ -15,5 +15,5 @@
-->
<permissions>
<feature name="android.software.voice_recognizers" />
<feature name="android.software.voice_recognizers" notLowRam="true" />
</permissions>

View File

@ -38,7 +38,7 @@
<!-- basic system services -->
<feature name="android.software.app_widgets" />
<feature name="android.software.connectionservice" />
<feature name="android.software.voice_recognizers" />
<feature name="android.software.voice_recognizers" notLowRam="true" />
<feature name="android.software.backup" />
<feature name="android.software.home_screen" />
<feature name="android.software.input_methods" />