Merge branch 'tizen' into tizen_3.0_develop
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Wed, 18 May 2016 08:52:16 +0000 (17:52 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Wed, 18 May 2016 08:54:44 +0000 (17:54 +0900)
Change-Id: I66e784495cd3cac72f59ee2be2bce2ee43eda937


Trivial merge