mozilla-b2g/gaia — pull request #22847 by dmarcos (2014-08-13 20:03:15+00:00)
Title: Bug 1049259 - [B2G][Notes] Cannot attach a picture directly from the cam...

...era when creating a new note

Conflicts:
apps/camera/js/app.js
apps/camera/js/controllers/camera.js
apps/camera/test/unit/app_test.js