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)
commit9947d82194051be5b15aa1f6101da413d2716af5
treea49ad53bc274dfca22c2f06ce03e026430c22549
parent91d8407587770c20b9503c5d3b58c4052adbfe5e
parent1d1bf9cec3aa86c043ebb4ddbc61ee0916ec9e32
Merge branch 'devel/master' into tizen

Change-Id: I12c4d05cce521dcd28fa17e25f4fa540262564ea