tree 4fed99924b11236a3ac616b84bfa12071626a0a6
parent 67d6590d242397acbb95814139301d2e6efd3631
parent c58b42327df5fbc826e2fcc2674ab6db0edfcd92
author Wu-cheng Li <wuchengli@google.com> 1270924935 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1270924935 -0700

am c58b4232: 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.