Merge branch 'develop'
authorHeekyoung, Oh <heekyoung.oh@samsung.com>
Tue, 7 Mar 2017 07:08:25 +0000 (16:08 +0900)
committerHeekyoung, Oh <heekyoung.oh@samsung.com>
Tue, 7 Mar 2017 07:08:32 +0000 (16:08 +0900)
Change-Id: Ic5a58d411832b96aa1994fe1d93d271a971e2e28
Signed-off-by: Heekyoung, Oh <heekyoung.oh@samsung.com>

Trivial merge