Merge branch 'develop' 26/125826/1
authorChangHyun Lee <leechwin.lee@samsung.com>
Wed, 19 Apr 2017 05:02:48 +0000 (14:02 +0900)
committerChangHyun Lee <leechwin.lee@samsung.com>
Wed, 19 Apr 2017 05:02:59 +0000 (14:02 +0900)
Change-Id: Id6e4c6586609909443ab7a621489bd6181b89050
Signed-off-by: ChangHyun Lee <leechwin.lee@samsung.com>

Trivial merge