Merge branch 'develop' 65/119065/1 v20170316
authorChangHyun Lee <leechwin.lee@samsung.com>
Wed, 15 Mar 2017 09:42:08 +0000 (18:42 +0900)
committerChangHyun Lee <leechwin.lee@samsung.com>
Wed, 15 Mar 2017 09:42:13 +0000 (18:42 +0900)
Change-Id: Ie6e76659864b2a040414b608bc8c6f6529efadcb
Signed-off-by: ChangHyun Lee <leechwin.lee@samsung.com>

Trivial merge