OSDN Git Service

Merge "Add support for non-ZSL, non-legacy cameras" into ub-camera-haleakala
authorPuneet Lall <puneetl@google.com>
Thu, 5 Feb 2015 18:27:14 +0000 (18:27 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 5 Feb 2015 18:27:14 +0000 (18:27 +0000)

Trivial merge