am cecb710a: am 94260caf: Allow control over search order for tethering upstream...

author TK MUN <tk.mun@samsung.com>

Mon, 6 Jun 2011 18:51:22 +0000 (11:51 -0700)

committer Android Git Automerger <android-git-automerger@android.com>

Mon, 6 Jun 2011 18:51:22 +0000 (11:51 -0700)
author TK MUN <tk.mun@samsung.com>
Mon, 6 Jun 2011 18:51:22 +0000 (11:51 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Mon, 6 Jun 2011 18:51:22 +0000 (11:51 -0700)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc services/java/com/android/server/connectivity/Tethering.java
Simple merge
author	TK MUN <tk.mun@samsung.com>
	Mon, 6 Jun 2011 18:51:22 +0000 (11:51 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Mon, 6 Jun 2011 18:51:22 +0000 (11:51 -0700)
		1	2
core/res/res/values/config.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/java/com/android/server/connectivity/Tethering.java	patch \|	diff1 \|	diff2 \|	blob \| history