Merge branch 'master' into tizen accepted/tizen/mobile/20151221.223740 accepted/tizen/tv/20151221.223810 accepted/tizen/wearable/20151221.223820 submit/tizen/20151221.111205
authorHyunjin Park <hj.na.park@samsung.com>
Mon, 21 Dec 2015 10:13:50 +0000 (19:13 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Mon, 21 Dec 2015 10:13:50 +0000 (19:13 +0900)
commit31f00855cdc112f31461c351859b1feedc764095
tree3b6ce26f2d4da84a8f8133d5621d71dc81800e58
parent07fc411d455109e1cc38d5734186fa981ee49b3e
parentbd28b38abdeba25a8e3e214f68ab9ac0d88958d8
Merge branch 'master' into tizen