Merge branch 'tizen' into tizen_sdk
authorwoojin <woojin2.jung@samsung.com>
Tue, 8 Mar 2016 03:54:07 +0000 (12:54 +0900)
committerwoojin <woojin2.jung@samsung.com>
Tue, 8 Mar 2016 03:54:07 +0000 (12:54 +0900)

Trivial merge