commit | bd61103faef2f75053c86764ae59b3b78d293448 | [log] [tgz] |
---|---|---|
author | Igor Murashkin <iam@google.com> | Tue May 14 11:03:36 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 14 11:03:36 2013 -0700 |
tree | 90cf41f7078c0a3af7be89c91f4a895c534de7fc | |
parent | a83b9767bc81d13101cad1df080ffeadedca2887 [diff] | |
parent | be03b28fb20b0f978ddd0fd04b637ede5de9bf1b [diff] |
am be03b28f: Merge "Camera: Pause preview when needing to delete jpeg/zsl streams" into jb-mr2-dev * commit 'be03b28fb20b0f978ddd0fd04b637ede5de9bf1b': Camera: Pause preview when needing to delete jpeg/zsl streams