Merge "Self Managed CS Implementation" am: 98fad21a8a am: 9fab4ad9b3

author Tyler Gunn <tgunn@google.com>

Fri, 31 Mar 2017 04:38:18 +0000 (04:38 +0000)

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

Fri, 31 Mar 2017 04:38:18 +0000 (04:38 +0000)
author Tyler Gunn <tgunn@google.com>
Fri, 31 Mar 2017 04:38:18 +0000 (04:38 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 31 Mar 2017 04:38:18 +0000 (04:38 +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 telecomm/java/android/telecom/TelecomManager.java
Simple merge
author	Tyler Gunn <tgunn@google.com>
	Fri, 31 Mar 2017 04:38:18 +0000 (04:38 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 31 Mar 2017 04:38:18 +0000 (04:38 +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
telecomm/java/android/telecom/TelecomManager.java	patch \|	diff1 \|	diff2 \|	blob \| history