Merge "wifi: Params for SAR limits" into oc-dr1-dev

author Roshan Pius <rpius@google.com>

Wed, 12 Jul 2017 18:33:20 +0000 (18:33 +0000)

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

Wed, 12 Jul 2017 18:33:20 +0000 (18:33 +0000)
author Roshan Pius <rpius@google.com>
Wed, 12 Jul 2017 18:33:20 +0000 (18:33 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 12 Jul 2017 18:33:20 +0000 (18:33 +0000)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
diff --cc wifi/java/android/net/wifi/WifiManager.java
Simple merge
author	Roshan Pius <rpius@google.com>
	Wed, 12 Jul 2017 18:33:20 +0000 (18:33 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 12 Jul 2017 18:33:20 +0000 (18: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
wifi/java/android/net/wifi/WifiManager.java	patch \|	diff1 \|	diff2 \|	blob \| history