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)

Trivial merge