mozilla-b2g/gaia — pull request #11939 by steveck-chung (2013-09-05 03:54:29+00:00)
Title: Bug 895726 - [Buri][Monitor][MMS] Unable to save attachement from Camera(with conflicts fixing)

Fix conflicts in:
- apps/sms/index.html
- apps/sms/js/startup.js