Merge "Adding self-managed connection service APIs." am: 3a7253a09d

author Tyler Gunn <tgunn@google.com>

Thu, 19 Jan 2017 18:34:53 +0000 (18:34 +0000)

committer android-build-merger <android-build-merger@google.com>

Thu, 19 Jan 2017 18:34:53 +0000 (18:34 +0000)
author Tyler Gunn <tgunn@google.com>
Thu, 19 Jan 2017 18:34:53 +0000 (18:34 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 19 Jan 2017 18:34:53 +0000 (18:34 +0000)
diff --cc core/res/AndroidManifest.xml
Simple merge
diff --cc telecomm/java/android/telecom/Connection.java
Simple merge
diff --cc telecomm/java/android/telecom/ConnectionService.java
Simple merge
diff --cc telecomm/java/android/telecom/RemoteConnectionService.java
Simple merge
author	Tyler Gunn <tgunn@google.com>
	Thu, 19 Jan 2017 18:34:53 +0000 (18:34 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 19 Jan 2017 18:34:53 +0000 (18:34 +0000)
		1	2
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
telecomm/java/android/telecom/Connection.java	patch \|	diff1 \|	diff2 \|	blob \| history
telecomm/java/android/telecom/ConnectionService.java	patch \|	diff1 \|	diff2 \|	blob \| history
telecomm/java/android/telecom/RemoteConnectionService.java	patch \|	diff1 \|	diff2 \|	blob \| history