tree 755c6a35b18307b7c0c81f5d8915184c413fdd0c
parent 6df92e75fcede11e0bc776ff9f5c64947335579a
parent d5c727fff96ab8bc56255847ce20ed17a8980c9d
author Jeffrey Vander Stoep <jeffv@google.com> 1452884954 +0000
committer android-build-merger <android-build-merger@google.com> 1452884954 +0000

Merge "camera_device: remove type"
am: d5c727fff9

* commit 'd5c727fff96ab8bc56255847ce20ed17a8980c9d':
  camera_device: remove type