Merge branch 'devel/master' into tizen 89/143989/1 accepted/tizen/4.0/unified/20170829.020056 accepted/tizen/unified/20170822.184847 submit/tizen/20170814.093340 submit/tizen/20170822.100117 submit/tizen_4.0/20170828.100004
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 14 Aug 2017 06:44:28 +0000 (15:44 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 14 Aug 2017 06:44:40 +0000 (15:44 +0900)
Change-Id: I504e0ae5590706c15a795458d4934c3ea1e44eac


Trivial merge