tree 80788021e00a2e443874dca6847f2407e652e3f7
parent 823f9a4892fc37d016fd98b8c04d5e78d3cb1478
parent ee42e7d5503c0d06bd0b2da96e5bb84ea086491a
author Ruben Brunk <rubenbrunk@google.com> 1439522906 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439522906 +0000

am ee42e7d5: am b65ce67e: am 3ba0c6ec: Merge "Fix deadlock conditions in Camera3Device." into mnc-dev

* commit 'ee42e7d5503c0d06bd0b2da96e5bb84ea086491a':
  Fix deadlock conditions in Camera3Device.