diff options
| author | Zhijun He <zhijunhe@google.com> | 2013-05-24 12:41:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-24 12:41:03 -0700 |
| commit | 55beec78a47a32288a01dde7fbc08406aa44345a (patch) | |
| tree | 2eaa6df85571c958d135de3144aa3f0f8af15599 /include/camera | |
| parent | 4032fc33089ddd6f4bc4f247f5c8f32a3f7f975e (diff) | |
| parent | 22a5ddb68173b75053d838a30d091920cd0a1dca (diff) | |
| download | frameworks_av-55beec78a47a32288a01dde7fbc08406aa44345a.zip frameworks_av-55beec78a47a32288a01dde7fbc08406aa44345a.tar.gz frameworks_av-55beec78a47a32288a01dde7fbc08406aa44345a.tar.bz2 | |
am 22a5ddb6: am 6f6b31da: Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev
* commit '22a5ddb68173b75053d838a30d091920cd0a1dca':
Camera3: Fix the deadlock during recording pinch zooming
Diffstat (limited to 'include/camera')
0 files changed, 0 insertions, 0 deletions