Merge branch 'develop_2.3.1' into platform_2.3.1
authorjihye <jihye424.kim@samsung.com>
Thu, 29 Sep 2016 07:16:35 +0000 (16:16 +0900)
committerjihye <jihye424.kim@samsung.com>
Thu, 29 Sep 2016 07:16:40 +0000 (16:16 +0900)
Change-Id: Ifeac3484d66749eaa1d1b1059f47025ce157aacf
Signed-off-by: jihye <jihye424.kim@samsung.com>

Trivial merge