Merge branch 'develop' into platform_3.0
authorjihye <jihye424.kim@samsung.com>
Wed, 28 Sep 2016 02:49:25 +0000 (11:49 +0900)
committerjihye <jihye424.kim@samsung.com>
Wed, 28 Sep 2016 02:49:38 +0000 (11:49 +0900)
Change-Id: I8086efad4b832f488d1fa267d295f7b27ba42464
Signed-off-by: jihye <jihye424.kim@samsung.com>

Trivial merge