tree e5e6642b836ec72d37f128af9e20f24236141ffe
parent ebbc6372b253ac0e072cb51058cebc56d2c4d457
parent a5e76f4d4b012102df014df7ec8c57436cf0727b
author Hung-ying Tyan <tyanh@google.com> 1285830358 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1285830358 -0700

Merge "Add uri field to SipManager.ListenerRelay" into gingerbread