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

Trivial merge