Merge branch 'devel/master' into tizen 68/137168/1
authorJinho, Lee <jeano.lee@samsung.com>
Tue, 4 Jul 2017 06:00:41 +0000 (15:00 +0900)
committerJinho, Lee <jeano.lee@samsung.com>
Tue, 4 Jul 2017 06:01:57 +0000 (15:01 +0900)
commit8bf9ec44a352293447247a21481222a171d957db
tree951440093aef4475b9d0bab609f47cecaf1473ce
parent155449f47de8b6e0a4c4edae2cab7ae16d5fd274
parentf041e9c5f60d1b5126278c673191629a21c7fa49
Merge branch 'devel/master' into tizen

Change-Id: I9d7bb28dab694ad14484e248ca9fb1cce69cdb03