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

Trivial merge