Merge branch 'devel/master' into tizen 78/129678/1 accepted/tizen/unified/20170518.061209 submit/tizen/20170517.083100 tizen_4.0.m1_release
authordongsug.song <dongsug.song@samsung.com>
Wed, 17 May 2017 12:06:24 +0000 (21:06 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Wed, 17 May 2017 12:07:01 +0000 (21:07 +0900)
Change-Id: I9f7203d059e21696c49a1e56ace5f2c93160cb42


Trivial merge