Resolved conflicts for merge of 67e72aa4 to master

Change-Id: Ib3904427c8f6bcc19895b39e4ce65eaa626e8396

diff --cc res/values/strings.xml
Simple merge

diff --cc res/xml/development_prefs.xml
Simple merge

diff --cc src/com/android/settings/DevelopmentSettings.java
index ed9a50b,f3a22ca..f16a19b
--- 1/src/com/android/settings/DevelopmentSettings.java
--- 2/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@@ -59,8 -59,6 +59,7 @@@ import android.view.Gravity
  import android.view.HardwareRenderer;
  import android.view.IWindowManager;
  import android.view.View;
- import android.webkit.WebViewFactory;
 +import android.view.accessibility.AccessibilityManager;
  import android.widget.CompoundButton;
  import android.widget.Switch;
  import android.widget.TextView;