Merge branch 'tizen' into develop
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Thu, 9 Jun 2016 07:12:05 +0000 (16:12 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Thu, 9 Jun 2016 07:12:05 +0000 (16:12 +0900)

Trivial merge