Merge branch 'develop' into platform_3.0
authorjihye424.kim <jihye424.kim@samsung.com>
Mon, 4 Jul 2016 08:16:57 +0000 (17:16 +0900)
committerjihye424.kim <jihye424.kim@samsung.com>
Mon, 4 Jul 2016 08:17:06 +0000 (17:17 +0900)
Change-Id: Ic2be2136c9c7f607686415ce627c34cfe2b7daf6
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>

Trivial merge