am fc64165e: am 74a331b5: Merge change I4c29c948 into eclair

Merge commit 'fc64165ef7116a385ae6d9983ab077adc47a6326' into eclair-mr2-plus-aosp

* commit 'fc64165ef7116a385ae6d9983ab077adc47a6326':
  fix [2269022] The raw picture displayed post shutter seems to have low-resolution