Bug 855968 - B2G MMS: delivery is not correctly indexed in DB. r=vicamo
Bug 843445 - B2G MMS: provide nsIDOMMobileMessageManager.retrieveMMS() to retrieve MMS for the deferred retrieval mode, part-1:idl part. r=vyang, sr=sicking

Conflicts:
	dom/mobilemessage/interfaces/nsIDOMMobileMessageManager.idl
Bug 843445 - B2G MMS: Provide nsIDOMMobileMessageManager.retrieveMMS()  to retrieve MMS for the deferred retrieval mode, part-2:mms_service. r=vyang, r=gene.lian, sr=sicking
Bug 855605 - B2G MMS: Support auto-home in retrieve mode. r=vyang
Bug 838467 1/5: use DOMCursor instead of SmsCursor. Interface changes. sr=sicking, r=bent

Conflicts:
	dom/mobilemessage/interfaces/nsIDOMSmsManager.idl
Bug 838467 2/5: DOM implementation. r=sicking,bent

Conflicts:
	dom/mobilemessage/interfaces/moz.build
	dom/mobilemessage/src/MobileMessageCallback.cpp
	dom/mobilemessage/src/SmsCursor.cpp
	dom/mobilemessage/src/SmsManager.cpp
	dom/mobilemessage/src/SmsMessage.h
	dom/mobilemessage/src/SmsRequest.cpp
	dom/mobilemessage/src/SmsRequest.h
Bug 838467 3/5: IPC. r=sicking,bent
Bug 838467 4/5: RIL. r=gwagner
Bug 838467 5/5: test cases. r=gwagner
Bug 849739 1/4 - WebSMS: Replace GetThreadList() with DOMCursor based GetThreads(). Interface changes. sr=mounir, r=bent
Bug 849739 2/4: DOM. r=mounir,mrbkap

Conflicts:
	dom/mobilemessage/interfaces/moz.build
	dom/mobilemessage/src/MobileMessageCallback.cpp
	dom/mobilemessage/src/SmsRequest.cpp
	dom/tests/mochitest/general/test_interfaces.html
Bug 849739 3/4: IPC. r=bent
Bug 849739 4/4: RIL. r=gwagner

Conflicts:
	dom/mobilemessage/src/ril/MobileMessageDatabaseService.js
Bug 749086 - 1/3: Use DOMRequest instead of SmsRequest. Interface changes. sr=sicking, r=bent

Conflicts:
	dom/mobilemessage/interfaces/nsIDOMSmsRequest.idl
Bug 749086 - 2/3: DOM & IPC changes. r=bent

Conflicts:
	dom/base/nsDOMClassInfo.cpp
	dom/base/nsDOMClassInfoClasses.h
	dom/mobilemessage/interfaces/moz.build
	dom/mobilemessage/src/SmsManager.cpp
	dom/mobilemessage/src/SmsRequest.cpp
	dom/mobilemessage/src/SmsRequest.h
	dom/system/gonk/ril_worker.js
Bug 749086 - 3/3: fix test cases. r=gwagner
Bug 855607 - B2G MMS: Notify user while retrieving expiried notification indication. r=vyang
Bug 847744: Part 1 - Create MmsService for content process. r=vicamo

--HG--
rename : dom/mobilemessage/src/SmsServicesFactory.h => dom/mobilemessage/src/android/MmsService.h
rename : dom/mobilemessage/src/SmsServicesFactory.h => dom/mobilemessage/src/fallback/MmsService.h
Bug 847744: Part 2 - Use sms-* topic to notify mms observers. r=vicamo

Conflicts:
	dom/mobilemessage/src/MobileMessageManager.cpp
Bug 847744: Part 3 - IPDL change. r=vicamo,jdm

Conflicts:
	dom/ipc/PContent.ipdl