Merge branch 'tizen' into tizen_line_coverage 69/144569/1
authorJeongmo Yang <jm80.yang@samsung.com>
Thu, 17 Aug 2017 07:07:58 +0000 (16:07 +0900)
committerJeongmo Yang <jm80.yang@samsung.com>
Thu, 17 Aug 2017 07:11:47 +0000 (16:11 +0900)
Change-Id: I879e8ad7021fe3942aaa2e02d320d8e3880fe4d7
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
1  2 
src/camera.c

diff --cc src/camera.c
Simple merge