Merge branch 'develop' 57/123557/1
authorChangHyun Lee <leechwin.lee@samsung.com>
Thu, 6 Apr 2017 05:46:50 +0000 (14:46 +0900)
committerChangHyun Lee <leechwin.lee@samsung.com>
Thu, 6 Apr 2017 05:46:56 +0000 (14:46 +0900)
Change-Id: I47067082e9d7d3aec3f2b187ca3a501848576ba9
Signed-off-by: ChangHyun Lee <leechwin.lee@samsung.com>

Trivial merge