Merge branch 'devel/master' into tizen 20/144020/1 accepted/tizen/4.0/unified/20170829.015803 accepted/tizen/unified/20170822.184853 accepted/tizen/unified/20170824.172454 submit/tizen/20170814.093340 submit/tizen/20170822.100117 submit/tizen/20170824.061020 submit/tizen_4.0/20170828.100004
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 14 Aug 2017 09:15:10 +0000 (18:15 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 14 Aug 2017 09:15:21 +0000 (18:15 +0900)
commit9cb7b3f1c42f27fab34568ac39c3f84de64d8abf
tree8e1a97df401f76a01d716fdc529ebc445fe9ebd1
parentf23321191776d855650ce6a24cd45b30c4ba2205
parentfb429476c130829057754f34d69de589ed2807be
Merge branch 'devel/master' into tizen

Change-Id: I4da7fee35759a303b5c1a55c55dbb46687d8b157