diff options
author | Zhijun He <zhijunhe@google.com> | 2013-05-24 15:32:48 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-24 15:32:48 +0000 |
commit | 6f6b31da6097f1d770137ebadac5023dd8b79413 (patch) | |
tree | 11c5a6996814abec2a3be7312a6aa626a1610f98 /media/libmedia/IMediaPlayerService.cpp | |
parent | 6947f125f76dde6664779126415d11b3365225da (diff) | |
parent | 124ccf4b5023a40c57b49981123e6c9b61408a5d (diff) | |
download | frameworks_av-6f6b31da6097f1d770137ebadac5023dd8b79413.zip frameworks_av-6f6b31da6097f1d770137ebadac5023dd8b79413.tar.gz frameworks_av-6f6b31da6097f1d770137ebadac5023dd8b79413.tar.bz2 |
Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev
Diffstat (limited to 'media/libmedia/IMediaPlayerService.cpp')
0 files changed, 0 insertions, 0 deletions