tree b353c2b24099757bec6d4ff34f8046ca0b6352d4
parent dd309b97f3e30cb8ab30892b4bf6b5d824853a86
parent d09801b99503b57c35e321ad9afa7e861e012813
author Eino-Ville Talvala <etalvala@google.com> 1367021438 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1367021438 +0000

Merge "Camera2: Fix deadlock on shutdown due to client getting killed." into jb-mr2-dev