OSDN Git Service

am 2a7411dc: am 5909cf83: Add RIL_UNSOL_RESEND_INCALL_MUTE.
authorJohn Wang <johnwang@google.com>
Sat, 30 Jan 2010 04:11:50 +0000 (20:11 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 30 Jan 2010 04:11:50 +0000 (20:11 -0800)
commit3475b8a74bf3d1e94688604326d5dd0f6d441852
treefc3b65596998042273d41b172cf0ea9ca63455c9
parentb8ee55034abce259759c62c8c3c826cac392474b
parent2a7411dc92f15111e36f72214216f96aab2c51f9
am 2a7411dc: am 5909cf83: Add RIL_UNSOL_RESEND_INCALL_MUTE.

Merge commit '2a7411dc92f15111e36f72214216f96aab2c51f9'

* commit '2a7411dc92f15111e36f72214216f96aab2c51f9':
  Add RIL_UNSOL_RESEND_INCALL_MUTE.
include/telephony/ril.h
libril/ril.cpp