am f4393101: Merge "Support configuring the protocol in APN settings." into gingerbread

* commit 'f4393101f80f0ca1a10771613a18565323b69fa2':
  Support configuring the protocol in APN settings.

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

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

diff --cc src/com/android/settings/ApnEditor.java
index 3f0c02f,4ac7401..0dbc99f
--- 1/src/com/android/settings/ApnEditor.java
--- 2/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@@ -234,10 -240,9 +242,11 @@@ public class ApnEditor extends Preferen
              int authVal = mCursor.getInt(AUTH_TYPE_INDEX);
              if (authVal != -1) {
                  mAuthType.setValueIndex(authVal);
 +            } else {
 +                mAuthType.setValue(null);
              }
  
+             mProtocol.setValue(mCursor.getString(PROTOCOL_INDEX));
          }
  
          mName.setSummary(checkNull(mName.getText()));