Merge branch 'develop' into platform_3.0
authorjihye424.kim <jihye424.kim@samsung.com>
Fri, 19 Aug 2016 02:58:48 +0000 (11:58 +0900)
committerjihye424.kim <jihye424.kim@samsung.com>
Fri, 19 Aug 2016 02:59:07 +0000 (11:59 +0900)
Change-Id: Ia1e246b61ab60f66f1a2f8f47fc32d5f36f0b4ba
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>

Trivial merge