PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 1adca55f to mnc-dr-dev

Browse Source 
Change-Id: Iac88fbc39bbfb7aaa730652794b4aa73618c1d9c
This commit is contained in:
Jason Monk
2015-08-04 16:23:32 -04:00
parent 2e3775b9b1 1adca55ffe
commit 9824c5da1e
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/arrays.xml
View File

@@ -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>