Merge branch 'tizen' into tizen_line_coverage 82/152882/1
authorJeongmo Yang <jm80.yang@samsung.com>
Wed, 27 Sep 2017 05:20:20 +0000 (14:20 +0900)
committerJeongmo Yang <jm80.yang@samsung.com>
Wed, 27 Sep 2017 09:42:55 +0000 (18:42 +0900)
Change-Id: I86f3050a497bff08b3ec6998401877b2a7703484
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
1  2 
CMakeLists.txt
src/camera.c

diff --cc CMakeLists.txt
Simple merge
diff --cc src/camera.c
Simple merge