OSDN Git Service

am 4f53fe74: Merge "CameraService: deadlock fix"
authorEino-Ville Talvala <etalvala@google.com>
Tue, 25 Mar 2014 18:25:13 +0000 (18:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Mar 2014 18:25:13 +0000 (18:25 +0000)
commit1cc3f85de70e813998102bf572caad3691a6b6a2
tree58d2dce7ce40bd51e3091b059c17b81eb9defc5d
parent7b1524d4e866b53ab0d02a59cc6ccb133bd98f77
parent4f53fe74051026e6635ba5bdbed4f1898cb66028
am 4f53fe74: Merge "CameraService: deadlock fix"

* commit '4f53fe74051026e6635ba5bdbed4f1898cb66028':
  CameraService: deadlock fix
services/camera/libcameraservice/CameraService.cpp