fix build again

Conflicts:
	src/com/android/mms/transaction/MessagingNotification.java

Change-Id: I1fac21e015331b384f07120d146e47584004fa21