tree 2be6180be2c505895805cf583c10f2640c03b8af
parent 2a9c6d09136a3d89b14cbfaaf9dcb58edc84cf7b
author Hung-ying Tyan <tyanh@google.com> 1287600566 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1287600566 -0700

Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread