diff options
author | Ari Hausman-Cohen <arihc@google.com> | 2018-08-13 15:52:15 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-08-13 15:52:15 -0700 |
commit | 61d87763032ece0d4b6b51e9751b3a7d364aadc1 (patch) | |
tree | ff4cf790f83a089afcfb7d5beba0a525bc00cec5 /modules/camera/3_4/v4l2_wrapper.cpp | |
parent | 3d2535d0f518c9b49fd7f5f37b5fd90dd9e4a913 (diff) | |
parent | cf5c9d616ca4d541110954931d54219bcb1c3da3 (diff) |
Merge changes Ib7227f18,I96926932,I46476112,I2c17b1e4,I47ee9e39, ... am: c809601217 am: 534edb5808
am: cf5c9d616c
Change-Id: I7adf6faf859354ddd1cb93b143514c2ae16152ea
Diffstat (limited to 'modules/camera/3_4/v4l2_wrapper.cpp')
-rw-r--r-- | modules/camera/3_4/v4l2_wrapper.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/camera/3_4/v4l2_wrapper.cpp b/modules/camera/3_4/v4l2_wrapper.cpp index d715e7ec..085683d6 100644 --- a/modules/camera/3_4/v4l2_wrapper.cpp +++ b/modules/camera/3_4/v4l2_wrapper.cpp @@ -14,6 +14,9 @@ * limitations under the License. */ +//#define LOG_NDEBUG 0 +#define LOG_TAG "V4L2Wrapper" + #include "v4l2_wrapper.h" #include <algorithm> |