Merge "Add "Call subject" capability to phone accounts." into mnc-dev

author Tyler Gunn <tgunn@google.com>

Tue, 28 Jul 2015 20:07:40 +0000 (20:07 +0000)

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

Tue, 28 Jul 2015 20:07:40 +0000 (20:07 +0000)
author Tyler Gunn <tgunn@google.com>
Tue, 28 Jul 2015 20:07:40 +0000 (20:07 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 28 Jul 2015 20:07:40 +0000 (20:07 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	Tyler Gunn <tgunn@google.com>
	Tue, 28 Jul 2015 20:07:40 +0000 (20:07 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 28 Jul 2015 20:07:40 +0000 (20:07 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history