am 8e5d21b0: am 5144a0d8: am 7cb0925e: Merge "Add extras to Connections/Calls. (1...

author Santos Cordon <santoscordon@google.com>

Fri, 29 May 2015 02:04:31 +0000 (02:04 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Fri, 29 May 2015 02:04:31 +0000 (02:04 +0000)
author Santos Cordon <santoscordon@google.com>
Fri, 29 May 2015 02:04:31 +0000 (02:04 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 29 May 2015 02:04:31 +0000 (02:04 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	Santos Cordon <santoscordon@google.com>
	Fri, 29 May 2015 02:04:31 +0000 (02:04 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 29 May 2015 02:04:31 +0000 (02:04 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history