mozilla-b2g/gaia — pull request #17152 by evelynhung (2014-03-13 10:29:49+00:00)
Title: Merge pull request #15190 from timdream/lockscreen-secure-camera

Bug 958425 - Stop copying Camera app to System app, r=alive, r=johu, r=yuren(cherry picked from commit ee0ed4c0f10f18d13957626371f0bce09e4d6303)

Conflicts:

apps/camera/js/app.js
apps/camera/test/unit/app_test.js
build/multilocale.js