commit | 926d9a89ed1cd4636001387f98a980381f2eb5c5 | [log] [tgz] |
---|---|---|
author | Wu-cheng Li <wuchengli@google.com> | Sat Apr 10 11:48:24 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Apr 10 11:48:24 2010 -0700 |
tree | 8528ec1aeaa4eff832140150b8e4b403185173af | |
parent | 8e60e09219bc1bfd8a3d514db919a5f7b69fcca3 [diff] | |
parent | 08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c [diff] |
am 08caa704: am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF. Merge commit '08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c' into kraken * commit '08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c': Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.