Merge branch 'develop' 39/125839/1
authorChulwoo Shin <cw1.shin@samsung.com>
Wed, 19 Apr 2017 05:31:31 +0000 (14:31 +0900)
committerChulwoo Shin <cw1.shin@samsung.com>
Wed, 19 Apr 2017 05:31:36 +0000 (14:31 +0900)
Change-Id: I8bdd31ad19fa3c5724d3fbe9fd4dd1a877650a3d
Signed-off-by: Chulwoo Shin <cw1.shin@samsung.com>

Trivial merge