Merge "Remove startActivityFromInCall API" into lmp-dev

author Evan Charlton <evanc@google.com>

Wed, 3 Sep 2014 20:07:46 +0000 (20:07 +0000)

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

Wed, 3 Sep 2014 20:07:47 +0000 (20:07 +0000)
author Evan Charlton <evanc@google.com>
Wed, 3 Sep 2014 20:07:46 +0000 (20:07 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 3 Sep 2014 20:07:47 +0000 (20:07 +0000)
diff --cc api/current.txt
Simple merge
diff --cc telecomm/java/android/telecomm/ConnectionService.java
Simple merge
diff --cc telecomm/java/android/telecomm/InCallService.java
Simple merge
author	Evan Charlton <evanc@google.com>
	Wed, 3 Sep 2014 20:07:46 +0000 (20:07 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 3 Sep 2014 20:07:47 +0000 (20:07 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
telecomm/java/android/telecomm/ConnectionService.java	patch \|	diff1 \|	diff2 \|	blob \| history
telecomm/java/android/telecomm/InCallService.java	patch \|	diff1 \|	diff2 \|	blob \| history