Merge branch 'develop_2.3' into platform_2.3
authorjihye424.kim <jihye424.kim@samsung.com>
Mon, 19 Sep 2016 02:12:33 +0000 (11:12 +0900)
committerjihye424.kim <jihye424.kim@samsung.com>
Mon, 19 Sep 2016 02:12:49 +0000 (11:12 +0900)
Change-Id: I57341781129e3e4267c2a05065b23f2ad7d8955f
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>

Trivial merge