OSDN Git Service

am 9e760d66: Merge "Camera2: Fix potential deadlock" into jb-mr1-dev
authorEino-Ville Talvala <etalvala@google.com>
Sat, 20 Oct 2012 00:19:35 +0000 (17:19 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 20 Oct 2012 00:19:35 +0000 (17:19 -0700)
* commit '9e760d66c5dfae4d9688e32d7a02fca09569f7ef':
  Camera2: Fix potential deadlock


Trivial merge