diff options
| author | Vinit Deshapnde <vinitd@google.com> | 2014-04-17 18:59:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-17 18:59:54 +0000 |
| commit | 72358802d6135c633dd158f44b988e4f4075e6fd (patch) | |
| tree | 6b8c27af2b31b63c6e4e7c2373d2e18877a63851 /core/res | |
| parent | cb38ee510abed0112aa47cb2da6bfe182400f321 (diff) | |
| parent | 45e746766676681e4e191d0b7e521b8b3f6c284c (diff) | |
| download | frameworks_base-72358802d6135c633dd158f44b988e4f4075e6fd.zip frameworks_base-72358802d6135c633dd158f44b988e4f4075e6fd.tar.gz frameworks_base-72358802d6135c633dd158f44b988e4f4075e6fd.tar.bz2 | |
am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev
* commit '45e746766676681e4e191d0b7e521b8b3f6c284c':
Don't reset country code once it is persisted
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/config.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 98ed72d..6efb4a4 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -352,10 +352,6 @@ <!-- Wifi driver supports batched scan --> <bool translatable="false" name="config_wifi_batched_scan_supported">false</bool> - <!-- Wifi driver's fallback country code; WS is ISO-Alpha2 code for Samoa which - has restrictions on can be scanned; which may satisfy quite a few regulatory issues. --> - <string translatable="false" name="config_wifi_unknown_country_code">WS</string> - <!-- Flag indicating whether the we should enable the automatic brightness in Settings. Software implementation will be used if config_hardware_auto_brightness_available is not set --> <bool name="config_automatic_brightness_available">false</bool> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 1200276..4171355 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -478,7 +478,6 @@ <java-symbol type="string" name="config_ntpServer" /> <java-symbol type="string" name="config_tether_apndata" /> <java-symbol type="string" name="config_useragentprofile_url" /> - <java-symbol type="string" name="config_wifi_unknown_country_code" /> <java-symbol type="string" name="config_wifi_p2p_device_type" /> <java-symbol type="string" name="contentServiceSync" /> <java-symbol type="string" name="contentServiceSyncNotificationTitle" /> |