am b9258b57: am d090054d: Merge "Fix ProCameraTests to pass on Wolfie,...
am b9258b57: am d090054d: Merge "Fix ProCameraTests to pass on Wolfie, disabling failing tests" into jb-mr2-dev
* commit 'b9258b57':
Fix ProCameraTests to pass on Wolfie, disabling failing tests