tree 7f7278dcb9a27bd292132b990aa16eb944bfe001
parent ae6260ea5ee69022a580c6aafe3a3dd296021738
parent e1fd7ab671780b5a3ad2693c722ff0b738053113
author Hung-ying Tyan <tyanh@google.com> 1286328802 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1286328802 -0700

Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread