Merge branch 'master' into tizen 60/35660/1 accepted/tizen/tv/20150223.074315 submit/tizen_tv/20150223.070926
authorJuWan Kim <juwan.kim@samsung.com>
Mon, 23 Feb 2015 06:57:23 +0000 (15:57 +0900)
committerJuWan Kim <juwan.kim@samsung.com>
Mon, 23 Feb 2015 06:59:05 +0000 (15:59 +0900)
commita3fc7960ac245572c11eb96e4409bf1ea29ce748
treec6c0477fd6b2ea6015f44058278f26547db3a7fc
parent155eef19df78b360943ec3a221715717ccb53618
parent9b3c0034559c3c67851a7feaf0b41844770ab630
Merge branch 'master' into tizen

Signed-off-by: JuWan Kim <juwan.kim@samsung.com>
Change-Id: Icd1604105bd43bf0c703b227c3cc6490852e0535