Merge branch 'tizen' of ssh://review.tizen.org:29418/profile/tv/apps/native/filebrows... accepted/tizen/tv/20150312.010704 accepted/tizen/tv/20150312.010722 submit/tizen_tv/20150311.041224 submit/tizen_tv/20150311.041242
authorKim Youngjin <yj21c.kim@samsung.com>
Wed, 11 Mar 2015 00:27:32 +0000 (09:27 +0900)
committerKim Youngjin <yj21c.kim@samsung.com>
Wed, 11 Mar 2015 00:27:48 +0000 (09:27 +0900)
Signed-off-by: Kim Youngjin <yj21c.kim@samsung.com>

Trivial merge