1e563f9118
Merge commit '968735e580b7728c6a17aff9b7356f9d74dc6eb3' into gingerbread-plus-aosp * commit '968735e580b7728c6a17aff9b7356f9d74dc6eb3': Fixing the NPE in SipPhone