| commit | 38311b33c89fd570e238e21dcecf6dd5ccd5726c | [log] [tgz] |
|---|---|---|
| author | Hung-ying Tyan <tyanh@google.com> | Wed Aug 18 14:20:41 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 18 14:20:41 2010 -0700 |
| tree | f8e18697cab0b5bf23cdc62c5de1838fbd39ae1b | |
| parent | e68de480fd8d7381349e27e21cbf12a88b9297d8 [diff] | |
| parent | 16848a15bbb7648bb1298c91f7969073c106115c [diff] |
am 16848a15: am f6354aca: Merge "CallManager: do not deliver ring event if fg call is live." into gingerbread Merge commit '16848a15bbb7648bb1298c91f7969073c106115c' * commit '16848a15bbb7648bb1298c91f7969073c106115c': CallManager: do not deliver ring event if fg call is live.