Merge branch 'tizen' into tizen_spin
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Wed, 20 Apr 2016 02:44:04 +0000 (11:44 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Wed, 20 Apr 2016 02:44:04 +0000 (11:44 +0900)

Trivial merge