tree 7d91bc751cc974eb4e99179cf9800ce61a73a5d6
parent 3a3dc8fef46d38a6c98b282ab6497a5b8eb1c742
parent 248ed700fed7e682eddf3d0607592eb5f3a3fb1a
author Yin-Chia Yeh <yinchiayeh@google.com> 1488496554 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1488496555 +0000

Merge "Camera: default implementation of device 1.0"