| commit | b0864b6a20dc2e72bd6d08ad3c06f0fa5cef92e0 | [log] [tgz] |
|---|---|---|
| author | Igor Murashkin <iam@google.com> | Thu May 02 16:07:57 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 02 16:07:57 2013 -0700 |
| tree | 5f1b6dee3f69d2c1b0d69fd2d15f34078ccfb0fe | |
| parent | 7888fe5051677548dd129cdeb1f5367423073d27 [diff] | |
| parent | f9539bb75101b85033eb45fd283b3fa40eaa8c98 [diff] |
am f9539bb7: am 2628bc9d: Merge "camera3: Don\'t crash when taking a still capture with ZSL disabled" into jb-mr2-dev * commit 'f9539bb75101b85033eb45fd283b3fa40eaa8c98': camera3: Don't crash when taking a still capture with ZSL disabled