am f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev

author Vinit Deshpande <vinitd@google.com>

Thu, 25 Sep 2014 16:22:40 +0000 (16:22 +0000)

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

Thu, 25 Sep 2014 16:22:40 +0000 (16:22 +0000)
author Vinit Deshpande <vinitd@google.com>
Thu, 25 Sep 2014 16:22:40 +0000 (16:22 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 25 Sep 2014 16:22:40 +0000 (16:22 +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, 25 Sep 2014 16:22:40 +0000 (16:22 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 25 Sep 2014 16:22:40 +0000 (16:22 +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