OSDN Git Service

Merge "Enable CaptureModule/ZSL" into ub-camera-haleakala
authorPuneet Lall <puneetl@google.com>
Thu, 16 Oct 2014 00:44:23 +0000 (00:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 16 Oct 2014 00:44:24 +0000 (00:44 +0000)

Trivial merge