am 64f6236c: am 2bc3ff3c: am de02fe2a: am 629909e0: Merge "Disable wifi firmware...

author Vinit Deshpande <vinitd@google.com>

Thu, 24 Sep 2015 04:33:59 +0000 (04:33 +0000)

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

Thu, 24 Sep 2015 04:33:59 +0000 (04:33 +0000)
author Vinit Deshpande <vinitd@google.com>
Thu, 24 Sep 2015 04:33:59 +0000 (04:33 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 24 Sep 2015 04:33:59 +0000 (04:33 +0000)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	Vinit Deshpande <vinitd@google.com>
	Thu, 24 Sep 2015 04:33:59 +0000 (04:33 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 24 Sep 2015 04:33:59 +0000 (04:33 +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