Merge commit 'c58b42327df5fbc826e2fcc2674ab6db0edfcd92' into froyo-plus-aosp * commit 'c58b42327df5fbc826e2fcc2674ab6db0edfcd92': Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
Merge commit 'c58b42327df5fbc826e2fcc2674ab6db0edfcd92' into froyo-plus-aosp * commit 'c58b42327df5fbc826e2fcc2674ab6db0edfcd92': Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.