am c5da1d3d: Merge "Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network." into lmp-mr1-dev

automerge: cac8662

* commit 'cac8662943b28663fefc6e5315a7b9acd514bfdb':
  Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network.
This commit is contained in:
Amit Mahajan
2014-12-12 04:05:59 +00:00
committed by android-build-merger
2 changed files with 4 additions and 1 deletions

View File

@@ -1975,7 +1975,9 @@
<!-- An array of CDMA roaming indicators which means international roaming -->
<integer-array translatable="false" name="config_cdma_international_roaming_indicators" />
<!-- set the system language as value of EF LI/EF PL -->
<bool name="config_use_sim_language_file">true</bool>
<!-- Use ERI text for network name on CDMA LTE -->
<bool name="config_LTE_eri_for_network_name">true</bool>
</resources>

View File

@@ -2147,4 +2147,5 @@
<java-symbol type="string" name="kg_text_message_separator" />
<java-symbol type="bool" name="config_use_sim_language_file" />
<java-symbol type="bool" name="config_LTE_eri_for_network_name" />
</resources>