OSDN Git Service

am a1aaaf86: am 4f53fe74: Merge "CameraService: deadlock fix"
authorEino-Ville Talvala <etalvala@google.com>
Tue, 25 Mar 2014 21:22:52 +0000 (21:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Mar 2014 21:22:52 +0000 (21:22 +0000)
commit29cdd9bb46437ab580deabf33b2242106e0090b6
treedd68d54734eb8fe5f4aa749f7f9d55dd5b138de7
parent1392eb3d1802e9f894f87d7a7387207d1b6faca1
parenta1aaaf86cd04eabaf961a30d7b0a9fa857089862
am a1aaaf86: am 4f53fe74: Merge "CameraService: deadlock fix"

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