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:
d3a5b48
ba696bb
)
am ba696bbf: Merge "camera2/3: Fix deadlock take picture while preview callback"...
author
Zhijun He
<zhijunhe@google.com>
Fri, 7 Jun 2013 16:59:47 +0000
(09:59 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 7 Jun 2013 16:59:47 +0000
(09:59 -0700)
* commit '
ba696bbff88d5627beaa0be95be78ba30138983d
':
camera2/3: Fix deadlock take picture while preview callback
Trivial merge