Merge branch 'develop' 58/123558/1
authorChangHyun Lee <leechwin.lee@samsung.com>
Thu, 6 Apr 2017 05:50:15 +0000 (14:50 +0900)
committerChangHyun Lee <leechwin.lee@samsung.com>
Thu, 6 Apr 2017 05:50:39 +0000 (14:50 +0900)
Change-Id: I0a4de9d5c0cdc6cd07edeef066bf74bc28b045af
Signed-off-by: ChangHyun Lee <leechwin.lee@samsung.com>

Trivial merge