OSDN Git Service

Merge "Force ZSL and CaptureModule to be enabled." into ub-camera-haleakala
authorPuneet Lall <puneetl@google.com>
Wed, 3 Sep 2014 22:05:44 +0000 (22:05 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 3 Sep 2014 22:05:44 +0000 (22:05 +0000)

Trivial merge