resolved conflicts for merge of 98f3aff3
to master
Change-Id: Icfc107998728e8571cf1e887027ab0067f3d40f8
This commit is contained in:
@@ -1393,7 +1393,7 @@
|
|||||||
<!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card. This will be done before the user phyiscally removes the SD card from the phone. Kind of like the "Safely remove" on some operating systems. -->
|
<!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card. This will be done before the user phyiscally removes the SD card from the phone. Kind of like the "Safely remove" on some operating systems. -->
|
||||||
<string name="sd_eject" product="default">Unmount SD card</string>
|
<string name="sd_eject" product="default">Unmount SD card</string>
|
||||||
<!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card. This will be done before the user phyiscally removes the SD card from the phone. Kind of like the "Safely remove" on some operating systems. [CHAR LIMIT=30] -->
|
<!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card. This will be done before the user phyiscally removes the SD card from the phone. Kind of like the "Safely remove" on some operating systems. [CHAR LIMIT=30] -->
|
||||||
<string name="sd_eject_summary" product="nosdcard">Unmount the internal USB storage so you can erase it</string>
|
<string name="sd_eject_summary" product="nosdcard">Unmount the internal USB storage</string>
|
||||||
<!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card. This will be done before the user phyiscally removes the SD card from the phone. Kind of like the "Safely remove" on some operating systems. -->
|
<!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card. This will be done before the user phyiscally removes the SD card from the phone. Kind of like the "Safely remove" on some operating systems. -->
|
||||||
<string name="sd_eject_summary" product="default">Unmount the SD card so you can safely remove it</string>
|
<string name="sd_eject_summary" product="default">Unmount the SD card so you can safely remove it</string>
|
||||||
<!-- SD card & phone storage settings item title for toggling PTP mode on and off. When PTP mode is on the device will appear on the USB bus as a PTP camera device instead of an MTP music player. -->
|
<!-- SD card & phone storage settings item title for toggling PTP mode on and off. When PTP mode is on the device will appear on the USB bus as a PTP camera device instead of an MTP music player. -->
|
||||||
|
Reference in New Issue
Block a user