Merge branch 'develop' 69/126569/2
authorChangHyun Lee <leechwin.lee@samsung.com>
Mon, 24 Apr 2017 07:35:50 +0000 (16:35 +0900)
committerChangHyun Lee <leechwin.lee@samsung.com>
Mon, 24 Apr 2017 07:39:58 +0000 (16:39 +0900)
Change-Id: I54d5ecb0f12719673cd34ba43257c60e82a24c73
Signed-off-by: ChangHyun Lee <leechwin.lee@samsung.com>

Trivial merge