Merge proposals dependent on lp:~fboucault/camera-app/orientation_lock_fix

lp:~fboucault/camera-app/orientation_lock_fix has no merge proposals.