Merge branch 'develop_2.3.1' into platform_2.3.1
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Mon, 4 Jul 2016 06:05:08 +0000 (15:05 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Mon, 4 Jul 2016 06:05:31 +0000 (15:05 +0900)
Change-Id: Ibb44669c88661682017a660fc0b0d92482bd52b2
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

Trivial merge