Merge branch 'devel/master' into tizen 88/134888/1 accepted/tizen/unified/20170630.083238 submit/tizen/20170621.112620 submit/tizen/20170622.035441
authorHeeyong Song <heeyong.song@samsung.com>
Tue, 20 Jun 2017 07:53:43 +0000 (16:53 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Tue, 20 Jun 2017 07:53:48 +0000 (16:53 +0900)
Change-Id: I282e9246428bec920ffe577cf33f0b63e930f48a


Trivial merge