| commit | ba696bbff88d5627beaa0be95be78ba30138983d | [log] [tgz] |
|---|---|---|
| author | Zhijun He <zhijunhe@google.com> | Fri Jun 07 16:58:12 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 07 16:58:12 2013 +0000 |
| tree | 8e4552cf33546cc2efb758973c92b472048bd9a0 | |
| parent | 18b466790aa0a55ff4282ed8b5e550e58e0444b2 [diff] | |
| parent | ddb104d382e5432e0b15c1b3ee91ba0eed73d0ec [diff] |
Merge "camera2/3: Fix deadlock take picture while preview callback" into jb-mr2-dev