Merge branch 'tizen' of ssh://review.tizen.org:29418/profile/tv/apps/native/settings...
authorKim Youngjin <yj21c.kim@samsung.com>
Wed, 8 Apr 2015 05:17:15 +0000 (14:17 +0900)
committerKim Youngjin <yj21c.kim@samsung.com>
Wed, 8 Apr 2015 05:17:15 +0000 (14:17 +0900)

Trivial merge