Merge branch 'tizen_3.0' into tizen 92/101092/1
authorYunmi Ha <yunmi.ha@samsung.com>
Wed, 30 Nov 2016 08:29:19 +0000 (17:29 +0900)
committerYunmi Ha <yunmi.ha@samsung.com>
Wed, 30 Nov 2016 08:30:18 +0000 (17:30 +0900)
Change-Id: I972ba1de0dd4f47d21577a3b2de4483d1ee2d0d3
Signed-off-by: Yunmi Ha <yunmi.ha@samsung.com>

Trivial merge