| commit | 4cde555e00a129f5684b1bdba1440fc89760383b | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Fri Oct 04 11:08:25 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 04 11:08:25 2013 -0700 |
| tree | 16cdfad20156871578692c819acac7f521cb0e66 | |
| parent | b7f82eaed2876bacc3a402182b75323026813c30 [diff] | |
| parent | 38ea22bb3a841dd37cc2be0fdca8c5e4ba3cf6db [diff] |
am 38ea22bb: am b2d71d3a: Merge "Camera API 2, Device 2/3: Implement idle and shutter callbacks" into klp-dev * commit '38ea22bb3a841dd37cc2be0fdca8c5e4ba3cf6db': Camera API 2, Device 2/3: Implement idle and shutter callbacks