Merge "Adding self-managed connection service APIs."

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

Thu, 19 Jan 2017 18:23:33 +0000 (18:23 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Thu, 19 Jan 2017 18:23:34 +0000 (18:23 +0000)
author Treehugger Robot <treehugger-gerrit@google.com>
Thu, 19 Jan 2017 18:23:33 +0000 (18:23 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 19 Jan 2017 18:23:34 +0000 (18:23 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
diff --cc core/res/res/values/strings.xml
Simple merge
author	Treehugger Robot <treehugger-gerrit@google.com>
	Thu, 19 Jan 2017 18:23:33 +0000 (18:23 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 19 Jan 2017 18:23:34 +0000 (18:23 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history