tree b2f5d5d8e4e9dee580233670912530da2b028ac0
parent a45ccfb88f043f859f9674b8d78b0c3e93328d10
parent 183f056393423b344e73f388f21d30379a38e519
author Ruben Brunk <rubenbrunk@google.com> 1439506775 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1439506775 +0000

Merge "Fix deadlock conditions in Camera3Device." into mnc-dev