diff options
| author | Jason Monk <jmonk@google.com> | 2015-08-04 20:43:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-04 20:43:01 +0000 |
| commit | bd776a0bb70b1956e3b7332fb75378df85b04a60 (patch) | |
| tree | c3e3cd5335441697cc774711281ba872a1482438 /res | |
| parent | 661d1b778828b79851b9ab7fb5d73cf8d3044aa8 (diff) | |
| parent | 9824c5da1efa9750fb19d477d29875a08289ecf5 (diff) | |
| download | packages_apps_Settings-bd776a0bb70b1956e3b7332fb75378df85b04a60.zip packages_apps_Settings-bd776a0bb70b1956e3b7332fb75378df85b04a60.tar.gz packages_apps_Settings-bd776a0bb70b1956e3b7332fb75378df85b04a60.tar.bz2 | |
am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev
* commit '9824c5da1efa9750fb19d477d29875a08289ecf5':
UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/arrays.xml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 97f5ead..e5f1988 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1389,12 +1389,4 @@ <item>0</item> </string-array> - <!-- These values must match up with the code in UsbModeChooserActivity.java. --> - <string-array name="usb_available_functions"> - <item>@string/usb_use_charging_only</item> - <item>@string/usb_use_file_transfers</item> - <item>@string/usb_use_photo_transfers</item> - <item>@string/usb_use_MIDI</item> - </string-array> - </resources> |