Merge branch 'develop_2.3.1' into platform_2.3.1
authorjihye424.kim <jihye424.kim@samsung.com>
Fri, 19 Aug 2016 03:04:17 +0000 (12:04 +0900)
committerjihye424.kim <jihye424.kim@samsung.com>
Fri, 19 Aug 2016 03:04:26 +0000 (12:04 +0900)
Change-Id: I3bf264e6df748442cf340a8ac5dff294a13495e8
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>

Trivial merge