tree 117e8ac2f90e4c9c4ca895f9ffb70ef5938594ae
parent d162eb098b65c9079605ff7085ed713a04912890
parent bb567e81a48c082b8961d1e773e28a3f5102cb4f
author Eino-Ville Talvala <etalvala@google.com> 1407864426 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1407782410 +0000

Merge "Switch to the correct camera feature list" into lmp-dev