| commit | 08102ee8425e39282893c2e84d2914e867124310 | [log] [tgz] |
|---|---|---|
| author | Igor Murashkin <iam@google.com> | Thu Oct 04 10:02:40 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 04 10:02:40 2012 -0700 |
| tree | bc1de52ecfe02e9ead371433348af2c760b0087a | |
| parent | 9f9d1efd436dd6fe4bb1a34e7cecc9292bd43697 [diff] | |
| parent | 557f7dc7c73f187e1ba4b2bee605b8c368cc4a64 [diff] |
am d6e8c5b1: am f66cc52c: Merge "Camera2: Fix deadlock while zooming during record" into jb-mr1-dev * commit 'd6e8c5b187225c55a279bc40f262fe137f2ef508': Camera2: Fix deadlock while zooming during record