Merge branch 'tizen' into tizen_sdk
authorwoojin <woojin2.jung@samsung.com>
Wed, 7 Oct 2015 05:50:02 +0000 (14:50 +0900)
committerwoojin <woojin2.jung@samsung.com>
Wed, 7 Oct 2015 05:50:02 +0000 (14:50 +0900)

Trivial merge