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)
commitd3313e8e2fcdca937f1b8be38b7d5770301409af
tree37b0383bcd54f9f21ea1bc04e6638f5e45c40606
parent2ffef84cb9d1330d59b54b0e1eefcec8296c8823
parent9cd94d77bcafad38f15b318ea5c9dbc0849c1ecd
Merge "Enable CaptureModule/ZSL" into ub-camera-haleakala