Merge branch 'tizen' into tizen_sdk
authorwoojin <woojin2.jung@samsung.com>
Wed, 18 Nov 2015 02:33:10 +0000 (11:33 +0900)
committerwoojin <woojin2.jung@samsung.com>
Wed, 18 Nov 2015 02:33:10 +0000 (11:33 +0900)

Trivial merge