Merge branch 'ocf' into ocf
author하성민/개발플랫폼팀/L3/ <sungmin82.ha@samsung.com>
Tue, 26 Sep 2017 23:34:59 +0000 (08:34 +0900)
committerGitHub Enterprise <noreply-CODE@samsung.com>
Tue, 26 Sep 2017 23:34:59 +0000 (08:34 +0900)

Trivial merge