commit | 7f7728ffb7e812a845078e2e905b4d17ea40b57c | [log] [tgz] |
---|---|---|
author | Igor Murashkin <iam@google.com> | Tue May 14 11:05:55 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 14 11:05:55 2013 -0700 |
tree | 8269a977394ab3e4da3125a71c41cf28efb256be | |
parent | 754995dc19159d5dd00095aca27d42f3bc8b3e5b [diff] | |
parent | bd61103faef2f75053c86764ae59b3b78d293448 [diff] |
am bd61103f: am be03b28f: Merge "Camera: Pause preview when needing to delete jpeg/zsl streams" into jb-mr2-dev * commit 'bd61103faef2f75053c86764ae59b3b78d293448': Camera: Pause preview when needing to delete jpeg/zsl streams