tree 2d37c843721642a9342ed39bdcea88311a3c25ae
parent 49b14f083cd0e9608cdf1f21181a018565a3b9d4
parent 8883ada99b8f666b24cfeec9442144cea4e2e2c7
author Eino-Ville Talvala <etalvala@google.com> 1411775592 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411775592 +0000

am 92a92a93: am 678e4328: Merge "Camera2: Fix parallel session and device close() exception" into lmp-dev

* commit '92a92a93c09d0e1f405d292560f32b2f3a4dc62d':
  Camera2: Fix parallel session and device close() exception