am 38e472df: am 6a5aad7b: am f51daced: Merge "Add setting to disable automatic USB audio routing" into lmp-dev

* commit '38e472df158a553f38f7e1e2ba69e61268709226':
  Add setting to disable automatic USB audio routing
This commit is contained in:
Glenn Kasten
2014-08-14 05:20:51 +00:00
committed by Android Git Automerger
3 changed files with 27 additions and 0 deletions

View File

@@ -4761,6 +4761,11 @@
<!-- UI debug setting: force use of NuPlayer summary [CHAR LIMIT=50] -->
<string name="use_nuplayer_summary">Use NuPlayer instead of AwesomePlayer</string>
<!-- UI debug setting: disable USB audio routing title [CHAR LIMIT=25] -->
<string name="usb_audio_disable_routing">Disable USB audio routing</string>
<!-- UI debug setting: disable USB audio routing summary [CHAR LIMIT=50] -->
<string name="usb_audio_disable_routing_summary">Disable automatic routing to USB audio peripherals</string>
<!-- UI debug setting: show layout bounds information [CHAR LIMIT=25] -->
<string name="debug_layout">Show layout bounds</string>
<!-- UI debug setting: show layout bounds information summary [CHAR LIMIT=50] -->