Merge branch 'develop' 87/122187/1 v20170331
authorChangHyun Lee <leechwin.lee@samsung.com>
Thu, 30 Mar 2017 12:04:08 +0000 (21:04 +0900)
committerChangHyun Lee <leechwin.lee@samsung.com>
Thu, 30 Mar 2017 12:04:14 +0000 (21:04 +0900)
Change-Id: I0a012ac459f324328bd06fbfc18b37af378816de
Signed-off-by: ChangHyun Lee <leechwin.lee@samsung.com>

Trivial merge