Merge branch 'develop_2.3' into platform_2.3
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Mon, 22 Aug 2016 07:05:46 +0000 (16:05 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Mon, 22 Aug 2016 07:06:00 +0000 (16:06 +0900)
Change-Id: Ib6e9a5205023692873a2e6890bc880057771b0ec
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

Trivial merge