Merge branch 'develop' 16/119016/1
authorHeekyoung, Oh <heekyoung.oh@samsung.com>
Wed, 15 Mar 2017 06:47:29 +0000 (15:47 +0900)
committerHeekyoung, Oh <heekyoung.oh@samsung.com>
Wed, 15 Mar 2017 06:48:04 +0000 (15:48 +0900)
Change-Id: I9ee97fa50120f2291f00fb8bd3fd3286c34ba361


Trivial merge