tree b4bef743d2ea599b920880f453a4bb83faff01d2
parent 0e412304813ccd3a3fb6a643836e4f0922d1dc44
parent fb3a98b1d8d0ad040980d509c4c5341928b9460b
author Hung-ying Tyan <tyanh@google.com> 1285809132 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1285809132 -0700

Merge "SIP: misc fixes." into gingerbread