Merge branch 'devel/master' into tizen 64/131864/1
authorJinho, Lee <jeano.lee@samsung.com>
Wed, 31 May 2017 02:30:55 +0000 (11:30 +0900)
committerJinho, Lee <jeano.lee@samsung.com>
Wed, 31 May 2017 02:31:13 +0000 (11:31 +0900)
commit15667b2f6a89cc0acd92b2bce111b69fb62e8711
tree405380b404329c1dcb7b35147f4db01c65dbcf6e
parentd43af698280788aa8d2ac4e727c89e2861a56449
parent3217488496dc62e67407a3641ee2d4b90fd29be0
Merge branch 'devel/master' into tizen

Change-Id: I42b6f15ace243810cebc558afb3d55ecb0cd6e65