Merge branch 'devel/master' into tizen 04/133604/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 13 Jun 2017 02:09:08 +0000 (11:09 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 13 Jun 2017 02:09:17 +0000 (11:09 +0900)
commit12906a89cce5a76c531d1c0974c8b8ca84c1bc74
tree20a2eb3d5b8c87ef2e9bb3f8e45a40257af7eef4
parented63441bde06354fa43116fa325b8e098bfefc9f
parent5827f9a9d195d4fba8da4d2adb2f0d386260f38c
Merge branch 'devel/master' into tizen

Change-Id: I870581e0065ea9a692599dd899fa90dc48854a89