am fef09e8f: am 1005569f: Merge change 23012 into eclair

Merge commit 'fef09e8f98f61d3d89a3890f5917061fd6a73015'

* commit 'fef09e8f98f61d3d89a3890f5917061fd6a73015':
  Fix issue #2084148: Define the format for the auto focus preview for barcode scanning