tree d989a16e415fcb7925dae085bfafab8df30578ae
parent 6daf70b26bfddf9ad079b925c0d586b789e3c207
parent 04ff9ec118817c023df8f551bb24cc8e770eb443
author Igor Murashkin <iam@google.com> 1357853660 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1357853660 -0800

Merge "Camera2: Fix a deadlock when closing the camera: DO NOT MERGE" into jb-mr1-aah-dev