Merge branch 'develop_2.3' into platform_2.3
authorjihye424.kim <jihye424.kim@samsung.com>
Fri, 19 Aug 2016 03:08:25 +0000 (12:08 +0900)
committerjihye424.kim <jihye424.kim@samsung.com>
Fri, 19 Aug 2016 03:08:40 +0000 (12:08 +0900)
Change-Id: I75980d5ca48c5a632c21ef0a4487fa33211c5149
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>

Trivial merge