Merge branch 'devel/master' into tizen 07/133607/1 accepted/tizen/unified/20170614.141239 submit/tizen/20170613.061944 submit/tizen/20170614.120205
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 13 Jun 2017 02:12:56 +0000 (11:12 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 13 Jun 2017 02:13:30 +0000 (11:13 +0900)
Change-Id: I12c4d05cce521dcd28fa17e25f4fa540262564ea


Trivial merge