am 18510113: resolved conflicts for merge of e00e35a5 to honeycomb-plus-aosp

* commit '18510113794df002ee288d8d5fdf8b64b4c957b5':
  Only leave one default network up at a time.

services/java/com/android/server/ConnectivityService.java

@@ -1294,6 +1294,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
                     }
                     if (!teardown(otherNet)) {
                         loge("Network declined teardown request");
+                        teardown(thisNet);
                         return;
                     }
                 }