Merge branch 'tizen_3.0' into tizen 15/97415/1
authorJi-hoon Lee <dalton.lee@samsung.com>
Mon, 14 Nov 2016 06:27:48 +0000 (15:27 +0900)
committerJi-hoon Lee <dalton.lee@samsung.com>
Mon, 14 Nov 2016 06:27:48 +0000 (15:27 +0900)
Change-Id: Id0bcca99a7545e094108e4d09006dcc28e7f54cd


Trivial merge