mozilla-b2g/gaia — pull request #17764 by nullaus (2014-03-28 16:42:09+00:00)
Title: V1.4

bug 981764

* Resolved merge conflicts.