Merge branch 'develop' into platform_3.0
authorjihye424.kim <jihye424.kim@samsung.com>
Thu, 22 Sep 2016 04:21:28 +0000 (13:21 +0900)
committerjihye424.kim <jihye424.kim@samsung.com>
Thu, 22 Sep 2016 04:21:34 +0000 (13:21 +0900)
Change-Id: I37dfc89136f3db0c400d03e40a2ded2d8f443bd6
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>

Trivial merge