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)
Change-Id: I9d7bb28dab694ad14484e248ca9fb1cce69cdb03


Trivial merge