OSDN Git Service

am a307beb6: Merge "Camera2: Fix deadlock on shutdown due to client getting killed...
authorEino-Ville Talvala <etalvala@google.com>
Sat, 27 Apr 2013 00:16:08 +0000 (17:16 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 27 Apr 2013 00:16:08 +0000 (17:16 -0700)
* commit 'a307beb68ac08d59525bbcb37ffb56bb3d4728c9':
  Camera2: Fix deadlock on shutdown due to client getting killed.


Trivial merge