OSDN Git Service

am 926d9a89: am 08caa704: am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
authorWu-cheng Li <wuchengli@google.com>
Sat, 10 Apr 2010 18:55:00 +0000 (11:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 10 Apr 2010 18:55:00 +0000 (11:55 -0700)

Trivial merge