Merge branch 'tizen' into develop
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 5 Jul 2016 06:30:22 +0000 (15:30 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 5 Jul 2016 06:30:22 +0000 (15:30 +0900)

Trivial merge