Merge "Implement new method for handling SMS/MMS on the platform" into klp-dev
David Braun [Tue, 17 Sep 2013 22:15:04 +0000 (22:15 +0000)]

Trivial merge