Merge branch 'develop' 49/119049/1
authorChangHyun Lee <leechwin.lee@samsung.com>
Wed, 15 Mar 2017 08:43:54 +0000 (17:43 +0900)
committerChangHyun Lee <leechwin.lee@samsung.com>
Wed, 15 Mar 2017 08:43:59 +0000 (17:43 +0900)
Change-Id: I354d5375463fc2c8f2fd7ea75a2fa617e432ed12
Signed-off-by: ChangHyun Lee <leechwin.lee@samsung.com>

Trivial merge