OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
14e585c
6f6b31d
)
am 6f6b31da: Merge "Camera3: Fix the deadlock during recording pinch zooming" into...
author
Zhijun He
<zhijunhe@google.com>
Fri, 24 May 2013 15:34:46 +0000
(08:34 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 24 May 2013 15:34:46 +0000
(08:34 -0700)
* commit '
6f6b31da6097f1d770137ebadac5023dd8b79413
':
Camera3: Fix the deadlock during recording pinch zooming
Trivial merge