Bug 948362 - [Gaia][Gallery] gallery application: handle data transfer
Bug 967908 Fix timing in test_sms_contact_validation r=me a=testonly
Bug 947855 - Revert "Merge pull request #15869 from jaoo/947855" for gaia-unit bustage on TBPL.

This reverts commit 8b298d51cb928f92b216b0f47e75d224568b9dfb, reversing
changes made to 853a44a11f04974086a1105b54393a1b171db05e.
Merge pull request #15631 from huchengtw-moz/gallery/Bug_948362_nfc_sharing

Bug 948362 - [Gaia][Gallery] gallery application: handle data transfer, r=dmarcos
Fixed sort() comparison in CameraUtils.selectOptimalPreviewSize().

Fixed rounding error in CameraUtils.selectOptimalPreviewSize() and added real-world test data.
Merge branch 'master' of https://github.com/justindarc/gaia