| commit | df2bc29664d3bf80bed0012970608e5605acf7af | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Fri Sep 21 18:34:43 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Sep 21 18:34:43 2012 -0700 |
| tree | c0ac024b9f8158a5163ea86dd072d8a3099de1c7 | |
| parent | 75dce94aca6203ada887b6c2d6a8a8130cdbfaca [diff] | |
| parent | 6b367f2a2bddfed60d63fa4da5e19ca13352a454 [diff] |
Merge "Camera2: Don't use ZSL when flash is on force fire mode." into jb-mr1-dev