Hopefully fix NPE

Started as a CP from Carbon --> Fail
So let's try a different way of defining null

Change-Id: I346ae4af4983e9e8dbe9533eeddef445affc339a
Signed-off-by: DHOMD <DHO@dho.im>
Mms fix for Halo - taskon home. Credits go to PA

Change-Id: I9b14e215c99bee99d6f08ae51ad1b41c78d10b2f
Signed-off-by: Dan Trifan <jimsth@gmail.com>
Merge branch 'master' into HEAD

Conflicts:
	src/com/android/mms/ui/MessageUtils.java

Change-Id: I9f3fc39b9d4b444804d75c50de667bb3db322627