Merge branch 'tizen' into tizen_sdk
authorwoojin <woojin2.jung@samsung.com>
Wed, 22 Jul 2015 07:45:30 +0000 (16:45 +0900)
committerwoojin <woojin2.jung@samsung.com>
Wed, 22 Jul 2015 07:45:30 +0000 (16:45 +0900)

Trivial merge