Merge "Declare official platform slice" into pi-dev

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

Mon, 12 Mar 2018 03:17:19 +0000 (03:17 +0000)

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

Mon, 12 Mar 2018 03:17:19 +0000 (03:17 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Mon, 12 Mar 2018 03:17:19 +0000 (03:17 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 12 Mar 2018 03:17:19 +0000 (03:17 +0000)
diff --cc AndroidManifest.xml
Simple merge
diff --cc tests/robotests/res/xml-mcc999/location_settings.xml
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Mon, 12 Mar 2018 03:17:19 +0000 (03:17 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 12 Mar 2018 03:17:19 +0000 (03:17 +0000)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
tests/robotests/res/xml-mcc999/location_settings.xml	patch \|	diff1 \|	diff2 \|	blob \| history