OSDN Git Service

Merge "Remove migrated config_carrier_wfc_ims_available"
authorJordan Liu <jminjie@google.com>
Thu, 1 Sep 2016 16:20:56 +0000 (16:20 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 1 Sep 2016 16:20:59 +0000 (16:20 +0000)
1  2 
core/res/res/values/config.xml
core/res/res/values/symbols.xml

Simple merge
    <java-symbol type="bool" name="config_carrier_volte_provisioned" />
    <java-symbol type="bool" name="config_carrier_volte_tty_supported" />
    <java-symbol type="bool" name="config_device_vt_available" />
 +  <java-symbol type="bool" name="config_device_respects_hold_carrier_config" />
    <java-symbol type="bool" name="config_carrier_vt_available" />
    <java-symbol type="bool" name="config_device_wfc_ims_available" />
-   <java-symbol type="bool" name="config_carrier_wfc_ims_available" />
    <java-symbol type="attr" name="touchscreenBlocksFocus" />
    <java-symbol type="layout" name="resolver_list_with_default" />
    <java-symbol type="string" name="whichApplicationNamed" />