Merge "Deprecate old TelecomManager actions"

author Brad Ebinger <breadley@google.com>

Mon, 23 Jan 2017 19:09:11 +0000 (19:09 +0000)

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

Mon, 23 Jan 2017 19:09:12 +0000 (19:09 +0000)
author Brad Ebinger <breadley@google.com>
Mon, 23 Jan 2017 19:09:11 +0000 (19:09 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 23 Jan 2017 19:09:12 +0000 (19:09 +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	Brad Ebinger <breadley@google.com>
	Mon, 23 Jan 2017 19:09:11 +0000 (19:09 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Mon, 23 Jan 2017 19:09:12 +0000 (19:09 +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