| commit | 585549bc13dc03859d39f92f13e9da5e583b2d28 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Mon Sep 24 09:26:15 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 24 09:26:15 2012 -0700 |
| tree | c0ac024b9f8158a5163ea86dd072d8a3099de1c7 | |
| parent | 43d0199a5c89d756cb3ac3c0c0fa7afe421be28b [diff] | |
| parent | df2bc29664d3bf80bed0012970608e5605acf7af [diff] |
am df2bc296: Merge "Camera2: Don\'t use ZSL when flash is on force fire mode." into jb-mr1-dev * commit 'df2bc29664d3bf80bed0012970608e5605acf7af': Camera2: Don't use ZSL when flash is on force fire mode.