am dcdbfc51: (-s ours) am 316c0db4: (-s ours) Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo
am bb2ddbba: am c0b5624c: Import revised translations
am 9b0a726e: am 43630806: Merge "Fix 2527411: Remove unusable display timeouts from Settings." into froyo
am 898c7e18: am e076bef9: Add new string to identify what speech recognizer the settings are for.
am e81d2381: am 38947ddc: Fix the build - doh.
am 5a7e9a66: am 388b4a87: Merge "Add Title to the Tether help dialog" into froyo
wifi settings option to only enable Next button once a wifi connection is established

Change-Id: I4b346648bce4b93f4885f1577a1510dcd18d8df5
Merge commit '79470d1a66f479919c13e27546391439cafa0ee7' into oxygen_4.3

* commit '79470d1a66f479919c13e27546391439cafa0ee7':
  wifi settings option to only enable Next button once a wifi connection is established