Merge branch 'tizen' into tizen_line_coverage 67/178167/1
authorJeongmo Yang <jm80.yang@samsung.com>
Tue, 8 May 2018 04:58:50 +0000 (13:58 +0900)
committerJeongmo Yang <jm80.yang@samsung.com>
Tue, 8 May 2018 10:57:47 +0000 (19:57 +0900)
commit994bad1b9cbd974ed8efb0dad18ed3a45c4184bf
treed676baa6d3425d28a4098b597b00a0c770e01b4a
parent8a5a10591f1e5fe33dc3241d4e547af2fe72f43e
parentddb0da8367f440e198ee697825f10c89b6aea252
Merge branch 'tizen' into tizen_line_coverage

Change-Id: Id86f07bcc3e319e4af95eb889a5695ffd8dfe2fe
CMakeLists.txt
src/camera.c