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

Trivial merge