[Merge] lp:~fboucault/camera-app/export_cancel_button into lp:camera-app

[Florian Boucault]

Florian Boucault has proposed merging lp:~fboucault/camera-app/export_cancel_button into lp:camera-app.

Commit message:
Added cancel button in content export mode.

Requested reviews:
  Ubuntu Phablet Team (phablet-team)
Related bugs:
  Bug #1362823 in camera-app: "should be cancel button when in content picking mode"
  https://bugs.launchpad.net/camera-app/+bug/1362823

For more details, see:
https://code.launchpad.net/~fboucault/camera-app/export_cancel_button/+merge/233223
-- 
https://code.launchpad.net/~fboucault/camera-app/export_cancel_button/+merge/233223
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~fboucault/camera-app/export_cancel_button into lp:camera-app.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 711 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20140903/67c9491a/attachment.diff>