am 35967d04: Merge "make wifi cellular params configurable" into lmp-dev

author vandwalle <vandwalle@google.com>

Sun, 14 Sep 2014 21:04:23 +0000 (21:04 +0000)

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

Sun, 14 Sep 2014 21:04:23 +0000 (21:04 +0000)
author vandwalle <vandwalle@google.com>
Sun, 14 Sep 2014 21:04:23 +0000 (21:04 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Sun, 14 Sep 2014 21:04:23 +0000 (21:04 +0000)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	vandwalle <vandwalle@google.com>
	Sun, 14 Sep 2014 21:04:23 +0000 (21:04 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Sun, 14 Sep 2014 21:04:23 +0000 (21:04 +0000)
		1	2
core/res/res/values/config.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history