LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflicts for merge of 85173cc0 to master

Browse Source 
Change-Id: I0ac3819b7c8a1822f217817ea6b8471cac24044f
This commit is contained in:
Jean-Baptiste Queru
2010-08-30 13:24:13 -07:00
parent e1a36a69e8 85173cc08a
commit 712e7865b0
7 changed files with 143 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/ApiDemos/res/values/strings.xml
View File

@@ -581,7 +581,6 @@
<string name="linear_layout_8_right">Right</string>
<string name="linear_layout_10_from">From:</string>
<string name="linear_layout_10_to">To:</string>
<string name="list_7_nothing">Nothing\u2026</string>
<string name="radio_group_snack">Snack</string>
<string name="radio_group_selection">"You have selected: "</string>
<string name="radio_group_none">(none)</string>
@@ -968,8 +967,8 @@
<!-- ============================ -->
<string name="sms_warning">
WARNING: this demo can send actual text messages (one at a time), so be sure to
test with the Android emulator or have a text messaging plan with your carrier.
WARNING: this demo can send actual text messages (one at a time), so be sure to
test with the Android emulator or have a text messaging plan with your carrier.
</string>
<string name="sms_enable_receiver">Enable SMS broadcast receiver</string>
<string name="sms_recipient_label">Recipient #</string>
@@ -981,4 +980,3 @@
<string name="share">Share</string>
</resources>