Merge branch ocf to develop
authorbdragon.park <bdragon.park@samsung.com>
Tue, 10 Oct 2017 07:52:54 +0000 (16:52 +0900)
committerbdragon.park <bdragon.park@samsung.com>
Tue, 10 Oct 2017 11:40:29 +0000 (20:40 +0900)
Signed-off-by: bdragon.park <bdragon.park@samsung.com>

Trivial merge