Merge branch 'master' of https://github.com/mozilla-b2g/gaia into Neeraj
Merge branch 'master' of https://github.com/mozilla-b2g/gaia into Neeraj
Merge branch 'master' of https://github.com/mozilla-b2g/gaia into Neeraj
Bug 814856 - "SD card" should be replaced with more generic "memory card" in settings.properties and camera.properties
Merge branch 'master' of https://github.com/NeerajSeth/gaia into Neeraj