Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE

author Robert Greenwalt <rgreenwalt@google.com>

Wed, 4 May 2011 16:59:30 +0000 (09:59 -0700)

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

Wed, 4 May 2011 16:59:30 +0000 (09:59 -0700)
author Robert Greenwalt <rgreenwalt@google.com>
Wed, 4 May 2011 16:59:30 +0000 (09:59 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 4 May 2011 16:59:30 +0000 (09:59 -0700)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc services/java/com/android/server/ConnectivityService.java
Simple merge
author	Robert Greenwalt <rgreenwalt@google.com>
	Wed, 4 May 2011 16:59:30 +0000 (09:59 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 4 May 2011 16:59:30 +0000 (09:59 -0700)
		1	2
core/res/res/values/config.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/java/com/android/server/ConnectivityService.java	patch \|	diff1 \|	diff2 \|	blob \| history