am 2a7411dc: am 5909cf83: Add RIL_UNSOL_RESEND_INCALL_MUTE.

author John Wang <johnwang@google.com>

Sat, 30 Jan 2010 04:11:50 +0000 (20:11 -0800)

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

Sat, 30 Jan 2010 04:11:50 +0000 (20:11 -0800)
author John Wang <johnwang@google.com>
Sat, 30 Jan 2010 04:11:50 +0000 (20:11 -0800)
committer Android Git Automerger <android-git-automerger@android.com>
Sat, 30 Jan 2010 04:11:50 +0000 (20:11 -0800)
diff --cc include/telephony/ril.h
Simple merge
diff --cc libril/ril.cpp
Simple merge
author	John Wang <johnwang@google.com>
	Sat, 30 Jan 2010 04:11:50 +0000 (20:11 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Sat, 30 Jan 2010 04:11:50 +0000 (20:11 -0800)
		1	2
include/telephony/ril.h	patch \|	diff1 \|	diff2 \|	blob \| history
libril/ril.cpp	patch \|	diff1 \|	diff2 \|	blob \| history