Merge branch 'tizen' into tizen_sdk
authorwoojin <woojin2.jung@samsung.com>
Sun, 11 Oct 2015 23:46:25 +0000 (08:46 +0900)
committerwoojin <woojin2.jung@samsung.com>
Sun, 11 Oct 2015 23:46:25 +0000 (08:46 +0900)

Trivial merge