diff options
| author | Eric Laurent <elaurent@google.com> | 2010-02-11 11:16:36 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-11 11:16:36 -0800 |
| commit | 777db0c08a1bee45acc2ca3fcc62ef1db6d0e221 (patch) | |
| tree | bb50d74a72792719b3ae9ecba7ac7bb2b6603539 /core | |
| parent | 6dee18c5cfdd5d63f3a9c299d2b61f819c07e920 (diff) | |
| parent | d7b92a0ff395fa45d934eaa4242bf2598da88964 (diff) | |
| download | frameworks_base-777db0c08a1bee45acc2ca3fcc62ef1db6d0e221.zip frameworks_base-777db0c08a1bee45acc2ca3fcc62ef1db6d0e221.tar.gz frameworks_base-777db0c08a1bee45acc2ca3fcc62ef1db6d0e221.tar.bz2 | |
Merge "resolved conflicts for merge of 61bb25f2 to master"
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/values/config.xml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 46d6352..2b8ddc4 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -237,8 +237,4 @@ <!-- Component name of the service providing geocoder API support. --> <string name="config_geocodeProvider">@null</string> - - <!-- Flag indicating whether headset events are used by kernel to indicate - TTY mode changes. --> - <bool name="tty_mode_uses_headset_events">false</bool> </resources> |