| commit | 50e7e703dba3f8544b1943e08b158b79d928df40 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Thu Sep 20 12:56:35 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 20 12:56:35 2012 -0700 |
| tree | a5f47724f1d918a91dc6929dac9e82b6c528d9d7 | |
| parent | f613bbd86e829592d5b1a8c9a39bf118c9fa2e88 [diff] | |
| parent | a1adc681d23a07426dcce5fcb7f4c3fafb0f96d7 [diff] |
am 8c3d991e: am aa05a277: Merge "Camera2: State must be STOPPED before JPEG callback is fired." into jb-mr1-dev * commit '8c3d991efed8d22cccef53683a7910d51b1ae047': Camera2: State must be STOPPED before JPEG callback is fired.