Merge branch 'develop' into platform_3.0
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Fri, 8 Jul 2016 05:43:50 +0000 (14:43 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Fri, 8 Jul 2016 05:44:07 +0000 (14:44 +0900)
Change-Id: I60d8b1c00837b0516a1c28e5dce7c7be49389d3e
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

Trivial merge