Merge branch 'develop_2.3.1' into platform_2.3.1
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Mon, 4 Jul 2016 06:52:57 +0000 (15:52 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Mon, 4 Jul 2016 06:52:57 +0000 (15:52 +0900)

Trivial merge