diff options
| author | Junda Liu <junda@google.com> | 2015-06-19 23:48:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-19 23:49:07 +0000 |
| commit | 8f87c8249b33feff0ac414576b90e5c70b5661be (patch) | |
| tree | c57d3a467fdfb4c03b16217def3b9943ab0348b2 /api | |
| parent | bf30b4fd92496cb0d66053ce777f29b4a07494b2 (diff) | |
| parent | 1826c234bcdc115c821da2991443e54f95e52888 (diff) | |
| download | frameworks_base-8f87c8249b33feff0ac414576b90e5c70b5661be.zip frameworks_base-8f87c8249b33feff0ac414576b90e5c70b5661be.tar.gz frameworks_base-8f87c8249b33feff0ac414576b90e5c70b5661be.tar.bz2 | |
Merge "Fix spelling of a config variable." into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 73a252b..3a319cb 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30620,7 +30620,7 @@ package android.telephony { field public static final java.lang.String KEY_DEFAULT_SIM_CALL_MANAGER_STRING = "default_sim_call_manager_string"; field public static final java.lang.String KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL = "disable_cdma_activation_code_bool"; field public static final java.lang.String KEY_DTMF_TYPE_ENABLED_BOOL = "dtmf_type_enabled_bool"; - field public static final java.lang.String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_vibration_bool"; + field public static final java.lang.String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_key_vibration_bool"; field public static final java.lang.String KEY_GSM_NONROAMING_NETWORKS_STRING_ARRAY = "gsm_nonroaming_networks_string_array"; field public static final java.lang.String KEY_GSM_ROAMING_NETWORKS_STRING_ARRAY = "gsm_roaming_networks_string_array"; field public static final java.lang.String KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL = "has_in_call_noise_suppression_bool"; diff --git a/api/system-current.txt b/api/system-current.txt index 9cfdf5f..95e685e 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -32843,7 +32843,7 @@ package android.telephony { field public static final java.lang.String KEY_DEFAULT_SIM_CALL_MANAGER_STRING = "default_sim_call_manager_string"; field public static final java.lang.String KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL = "disable_cdma_activation_code_bool"; field public static final java.lang.String KEY_DTMF_TYPE_ENABLED_BOOL = "dtmf_type_enabled_bool"; - field public static final java.lang.String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_vibration_bool"; + field public static final java.lang.String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_key_vibration_bool"; field public static final java.lang.String KEY_GSM_NONROAMING_NETWORKS_STRING_ARRAY = "gsm_nonroaming_networks_string_array"; field public static final java.lang.String KEY_GSM_ROAMING_NETWORKS_STRING_ARRAY = "gsm_roaming_networks_string_array"; field public static final java.lang.String KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL = "has_in_call_noise_suppression_bool"; |