| commit | 557f7dc7c73f187e1ba4b2bee605b8c368cc4a64 | [log] [tgz] |
|---|---|---|
| author | Igor Murashkin <iam@google.com> | Thu Oct 04 10:00:47 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 04 10:00:47 2012 -0700 |
| tree | 2981393cca96745a0028c5cb519820333d9885c6 | |
| parent | 377d8303be83b2d9977182babc38b7939ecb7e29 [diff] | |
| parent | 5e8e66f369fd2f1918495380ed1886e50818e95e [diff] |
am f66cc52c: Merge "Camera2: Fix deadlock while zooming during record" into jb-mr1-dev * commit 'f66cc52cc5a075b86b585cf72c4a41f6907b2142': Camera2: Fix deadlock while zooming during record