Merge branch 'develop' into platform_3.0
authorjihye424.kim <jihye424.kim@samsung.com>
Wed, 21 Sep 2016 02:12:17 +0000 (11:12 +0900)
committerjihye424.kim <jihye424.kim@samsung.com>
Wed, 21 Sep 2016 02:12:27 +0000 (11:12 +0900)
Change-Id: I3507722808413b777bc9783b3be401c686dcd0e6
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>

Trivial merge