am 6333eb78: am ca2e6a93: am ffa8f101: Merge "Migrating MmsConfig to CarrierConfigMan...

author Jonathan Basseri <misterikkit@google.com>

Tue, 2 Jun 2015 21:27:47 +0000 (21:27 +0000)

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

Tue, 2 Jun 2015 21:27:47 +0000 (21:27 +0000)
author Jonathan Basseri <misterikkit@google.com>
Tue, 2 Jun 2015 21:27:47 +0000 (21:27 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 2 Jun 2015 21:27:47 +0000 (21:27 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	Jonathan Basseri <misterikkit@google.com>
	Tue, 2 Jun 2015 21:27:47 +0000 (21:27 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 2 Jun 2015 21:27:47 +0000 (21:27 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history