Merge "Start default connections on startup."

author Robert Greenwalt <rgreenwalt@google.com>

Wed, 20 Jul 2011 17:10:24 +0000 (10:10 -0700)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 20 Jul 2011 17:10:24 +0000 (10:10 -0700)
author Robert Greenwalt <rgreenwalt@google.com>
Wed, 20 Jul 2011 17:10:24 +0000 (10:10 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 20 Jul 2011 17:10:24 +0000 (10:10 -0700)
diff --cc services/java/com/android/server/ConnectivityService.java
Simple merge
author	Robert Greenwalt <rgreenwalt@google.com>
	Wed, 20 Jul 2011 17:10:24 +0000 (10:10 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 20 Jul 2011 17:10:24 +0000 (10:10 -0700)