summaryrefslogtreecommitdiffstats
path: root/voip/java/android
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-10-20 11:49:26 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-20 11:49:26 -0700
commitbaced375ba5f374445c44a2115700d69693794a0 (patch)
tree1c5d8eee05005aa32e24d5455ac9b7fac929b7a4 /voip/java/android
parent74b1ed3231b8cafcf4e5cb3f03d794acd5080004 (diff)
parent88e3f0ad28c40eb1c76fa996277e64996acd9b03 (diff)
downloadframeworks_base-baced375ba5f374445c44a2115700d69693794a0.zip
frameworks_base-baced375ba5f374445c44a2115700d69693794a0.tar.gz
frameworks_base-baced375ba5f374445c44a2115700d69693794a0.tar.bz2
Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread
Diffstat (limited to 'voip/java/android')
0 files changed, 0 insertions, 0 deletions