tree 968800eb2b497087b11966fe65b736b2f2ac043c
parent d3ea7d61a31d8719da3c809ebc28ece3eafd5b85
parent d3b85f69a811113826933c8abf591f20e9b3c8ff
author Eino-Ville Talvala <etalvala@google.com> 1407442679 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1407423645 +0000

Merge topic 'camera2-remove-hidden' into lmp-dev

* changes:
  Camera2: Fix session shutdown race, frequent warning log
  Camera2: Remove hidden parts of public CameraDevice
  Camera2: Fix null-listener capture for CameraCaptureSession