Merge branch 'tizen' into tizen_sdk
authorwoojin <woojin2.jung@samsung.com>
Wed, 30 Sep 2015 23:30:45 +0000 (08:30 +0900)
committerwoojin <woojin2.jung@samsung.com>
Wed, 30 Sep 2015 23:30:45 +0000 (08:30 +0900)

Trivial merge