Merge branch 'develop' into platform_3.0
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Fri, 12 Aug 2016 05:26:47 +0000 (14:26 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Fri, 12 Aug 2016 05:26:52 +0000 (14:26 +0900)
Change-Id: I90f08c939fa4855dcc0093e618cb5e17e57f0fd2
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

Trivial merge