am ce1bfbb0: resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp

* commit 'ce1bfbb04e75a9b4362b2f3070ff4ee5406f136d':
  Removing display number format from SIM UI
This commit is contained in:
Sanket Padawe
2014-10-10 05:15:52 +00:00
committed by Android Git Automerger
4 changed files with 0 additions and 39 deletions

View File

@@ -408,14 +408,6 @@
<item>Set usage cycle...</item>
</string-array>
<!-- Sim Cards display numbers. Range of data usage. -->
<string-array name="sim_card_data_range">
<!-- Last 4 digits [CHAR LIMIT=40]-->
<item>Last 4 digits</item>
<!-- First 4 digits [CHAR LIMIT=40]-->
<item>First 4 digits</item>
</string-array>
<!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
<string-array name="wifi_frequency_band_entries">
<!-- Operation on both 2.4 GHz and 5 GHz [CHAR LIMIT=25]-->