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:
1392eb3
a1aaaf8
)
am a1aaaf86: am 4f53fe74: Merge "CameraService: deadlock fix"
author
Eino-Ville Talvala
<etalvala@google.com>
Tue, 25 Mar 2014 21:22:52 +0000
(21:22 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 25 Mar 2014 21:22:52 +0000
(21:22 +0000)
* commit '
a1aaaf86cd04eabaf961a30d7b0a9fa857089862
':
CameraService: deadlock fix
1
2
services/camera/libcameraservice/CameraService.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/camera/libcameraservice/CameraService.cpp
Simple merge
OSDN Git Service
