Merge branch 'tizen_3.0_develop' into tizen_3.0
authorSooyoung Ha <yoosah.ha@samsung.com>
Tue, 7 Jun 2016 13:36:26 +0000 (22:36 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Tue, 7 Jun 2016 13:36:35 +0000 (22:36 +0900)
Change-ID: I1706f2727dc9354d40e491251e336ebe183d3539
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

Trivial merge