Merge "Add config config_smart_battery_available" into pi-dev

author TreeHugger Robot <treehugger-gerrit@google.com>

Thu, 17 May 2018 02:43:22 +0000 (02:43 +0000)

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

Thu, 17 May 2018 02:43:22 +0000 (02:43 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Thu, 17 May 2018 02:43:22 +0000 (02:43 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 17 May 2018 02:43:22 +0000 (02:43 +0000)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Thu, 17 May 2018 02:43:22 +0000 (02:43 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 17 May 2018 02:43:22 +0000 (02:43 +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