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:
9490a96
e097efd
)
am e097efde: am b05eeaed: camera3: Fix crash in set error state.
author
Zhijun He
<zhijunhe@google.com>
Thu, 6 Jun 2013 21:22:29 +0000
(14:22 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 6 Jun 2013 21:22:29 +0000
(14:22 -0700)
* commit '
e097efde4363f80d5ffc34da6ec6253fbd4e5397
':
camera3: Fix crash in set error state.
1
2
services/camera/libcameraservice/Camera3Device.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/camera/libcameraservice/Camera3Device.cpp
Simple merge