tree 573f82e66ffff86035ea45ebbc906cd20cca02e4
parent 53855bba8e05d04b9feb8768645a0a02fe9daef6
parent b96430562f4f04025ef2b7fb4ed93dc9395dc9b2
author Ruben Brunk <rubenbrunk@google.com> 1428090863 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1428090863 +0000

Merge "Camera3: Add support for conflicting_devices and resource_cost"