Merge branch 'develop' into platform_3.0
authorSooyoung Ha <yoosah.ha@samsung.com>
Fri, 14 Oct 2016 04:53:26 +0000 (13:53 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Fri, 14 Oct 2016 04:53:29 +0000 (13:53 +0900)
Change-ID: I440e3c83a8b74cea24e8d7dfdc79dcb4a8948c1d
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

Trivial merge