提交: 6524283b5ba6d0f6f6a120fbec14254d659f5ced - packages-apps-Settings (git)

packages/apps/Settings

Commit MetaInfo

• 修订版: 6524283b5ba6d0f6f6a120fbec14254d659f5ced (tree)
• 时间: 2012-04-05 19:01:44
• 作者: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

Merge commit 'android-4.0.4_r1.1' into ics-x86

Conflicts:
res/values-zu/arrays.xml

更改概述

• modified: res/values-af/strings.xml
• modified: res/values-am/strings.xml
• modified: res/values-ar/strings.xml
• modified: res/values-be/strings.xml
• modified: res/values-bg/strings.xml
• modified: res/values-ca/strings.xml
• modified: res/values-cs/strings.xml
• modified: res/values-da/strings.xml
• modified: res/values-de/strings.xml
• modified: res/values-el/strings.xml
• modified: res/values-en-rGB/strings.xml
• modified: res/values-es-rUS/arrays.xml
• modified: res/values-es-rUS/strings.xml
• modified: res/values-es/strings.xml
• modified: res/values-et/strings.xml
• modified: res/values-fa/strings.xml
• modified: res/values-fi/strings.xml
• modified: res/values-fr/strings.xml
• modified: res/values-hi/strings.xml
• modified: res/values-hr/strings.xml
• modified: res/values-hu/strings.xml
• modified: res/values-in/strings.xml
• modified: res/values-it/strings.xml
• modified: res/values-iw/strings.xml
• modified: res/values-ja/strings.xml
• modified: res/values-ko/strings.xml
• modified: res/values-lt/strings.xml
• modified: res/values-lv/strings.xml
• modified: res/values-ms/strings.xml
• modified: res/values-nb/strings.xml
• modified: res/values-nl/strings.xml
• modified: res/values-pl/arrays.xml
• modified: res/values-pl/strings.xml
• modified: res/values-pt-rPT/strings.xml
• modified: res/values-pt/arrays.xml
• modified: res/values-pt/strings.xml
• modified: res/values-rm/arrays.xml
• modified: res/values-rm/strings.xml
• modified: res/values-ro/strings.xml
• modified: res/values-ru/arrays.xml
• modified: res/values-ru/strings.xml
• modified: res/values-sk/strings.xml
• modified: res/values-sl/arrays.xml
• modified: res/values-sl/strings.xml
• modified: res/values-sr/strings.xml
• modified: res/values-sv/strings.xml
• modified: res/values-sw/strings.xml
• modified: res/values-th/strings.xml
• modified: res/values-tl/strings.xml
• modified: res/values-tr/strings.xml
• modified: res/values-uk/strings.xml
• modified: res/values-vi/strings.xml
• modified: res/values-zh-rCN/strings.xml
• modified: res/values-zh-rTW/strings.xml
• modified: res/values-zu/arrays.xml
• modified: res/values-zu/strings.xml
• modified: res/values/strings.xml
• modified: res/xml/security_settings_biometric_weak.xml
• modified: res/xml/security_settings_password.xml
• modified: res/xml/security_settings_pattern.xml
• modified: res/xml/security_settings_pin.xml
• modified: src/com/android/settings/SecuritySettings.java
• modified: src/com/android/settings/TetherSettings.java
• modified: src/com/android/settings/bluetooth/BluetoothSettings.java
• modified: src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
• modified: src/com/android/settings/fuelgauge/PowerUsageSummary.java
• modified: src/com/android/settings/tts/TtsEnginePreference.java
• modified: src/com/android/settings/tts/TtsEngineSettingsFragment.java