diff options
author | Justin <justinklaassen@google.com> | 2015-08-06 11:31:27 -0700 |
---|---|---|
committer | Justin <justinklaassen@google.com> | 2015-08-06 11:31:27 -0700 |
commit | e6a3785d3b981eb948f2722f146a07d49a36987f (patch) | |
tree | 54422005c3b1004deb9b1272d3c7e41fb6fd174e /data/res/values/symbols.xml | |
parent | 351c121e40eadb37216029b6da1b845f4aba820b (diff) | |
download | android-21-e6a3785d3b981eb948f2722f146a07d49a36987f.tar.gz |
Import android-21 r02 - DO NOT MERGEstudio-master-dev_before_27917934studio-master-dev_before_26911779studio-2.0-rc1studio-2.0studio-1.5gradle_2.0.0
http://dl.google.com/android/repository/android-21_r02.zip
Change-Id: I4d5e49c0c1bb007090045aa095d23a1ea76749e0
Diffstat (limited to 'data/res/values/symbols.xml')
-rw-r--r-- | data/res/values/symbols.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/data/res/values/symbols.xml b/data/res/values/symbols.xml index 2a9e1d1e..30787224 100644 --- a/data/res/values/symbols.xml +++ b/data/res/values/symbols.xml @@ -1644,6 +1644,7 @@ <java-symbol type="string" name="aerr_application" /> <java-symbol type="string" name="aerr_process" /> <java-symbol type="string" name="aerr_title" /> + <java-symbol type="string" name="android_upgrading_fstrim" /> <java-symbol type="string" name="android_upgrading_apk" /> <java-symbol type="string" name="android_upgrading_complete" /> <java-symbol type="string" name="android_upgrading_starting_apps" /> @@ -2072,4 +2073,5 @@ <java-symbol type="bool" name="config_switch_phone_on_voice_reg_state_change" /> <java-symbol type="string" name="whichHomeApplicationNamed" /> <java-symbol type="bool" name="config_sms_force_7bit_encoding" /> + <java-symbol type="array" name="config_sms_convert_destination_number_support" /> </resources> |