Merge branch 'devel/master' into tizen 12/133812/1 accepted/tizen/unified/20170614.141246 submit/tizen/20170613.061944 submit/tizen/20170614.120205
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 13 Jun 2017 10:50:36 +0000 (19:50 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 13 Jun 2017 10:51:06 +0000 (19:51 +0900)
commit69bf9e824d5f22da5826fc4307c9d57b696c75c7
treeaaad0f20986ed4fa30bbf7d64076fc19b73ec175
parent8044a7495baef62a9c5066e6cfca51464907f6c2
parent42302a1816402d0466fe3efaeedb515e2f5acadf
Merge branch 'devel/master' into tizen

Change-Id: I247394d29a6b14b92ea98464394aee4b29ab1da0