Merge branch 'tizen' into tizen_3.0 submit/tizen_3.0/20161103.094516
authorHyunho Kang <hhstark.kang@samsung.com>
Thu, 3 Nov 2016 11:13:29 +0000 (20:13 +0900)
committerHyunho Kang <hhstark.kang@samsung.com>
Thu, 3 Nov 2016 11:13:29 +0000 (20:13 +0900)

Trivial merge