Merge branch 'devel/master' into tizen 46/137146/1
authorJinho, Lee <jeano.lee@samsung.com>
Tue, 4 Jul 2017 05:53:51 +0000 (14:53 +0900)
committerJinho, Lee <jeano.lee@samsung.com>
Tue, 4 Jul 2017 06:01:57 +0000 (15:01 +0900)
commit853600b419feddf78277218a1145fe3e26c8b3af
tree415bafd255a1d2426c61e894a44acd9009a75d0c
parent511930f3362c2e3a5d060764d721664e2c9c5149
parentb89cdba6eca3fa6a3d0933b77837c51c803aa1ab
Merge branch 'devel/master' into tizen

Change-Id: I38bb2daa0fe3eca531b7d79d9d9dae26ffcecfc2