Hung-ying Tyan 16848a15bb am f6354aca: Merge "CallManager: do not deliver ring event if fg call is live." into gingerbread ...

Merge commit 'f6354aca3a4d0571a66747d9cdc247a1d411d660' into gingerbread-plus-aosp

* commit 'f6354aca3a4d0571a66747d9cdc247a1d411d660':
  CallManager: do not deliver ring event if fg call is live.

2010-08-18 13:37:11 -07:00

..

android/telephony

am 3f442ece: Merge "Fix character count bug and Javadoc typos in SMS (with test cases)" into gingerbread

2010-08-13 15:19:11 -07:00

com/android/internal/telephony

am f6354aca: Merge "CallManager: do not deliver ring event if fg call is live." into gingerbread

2010-08-18 13:37:11 -07:00