tree d3d277f3531161cbe93d6e16234e7a5a06a809ff
parent 04e5a1cba9671d2d6b07dbb9bc3b8d18fa610321
parent 912e0f7d9e377905ded6af3d01c52952e4fead2b
author Hung-ying Tyan <tyanh@google.com> 1282091645 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1282091645 -0700

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