| commit | 38ea22bb3a841dd37cc2be0fdca8c5e4ba3cf6db | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Thu Oct 03 15:40:03 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 03 15:40:03 2013 -0700 |
| tree | 541cd6b2744df37377dcda534cb9cef26aec8525 | |
| parent | aa50cc78be8a1067a0694a97b04d5a24b80af475 [diff] | |
| parent | b2d71d3a35de6382096ed688a4cae3bbca3c97bf [diff] |
am b2d71d3a: Merge "Camera API 2, Device 2/3: Implement idle and shutter callbacks" into klp-dev * commit 'b2d71d3a35de6382096ed688a4cae3bbca3c97bf': Camera API 2, Device 2/3: Implement idle and shutter callbacks