Merge branch 'tizen_3.0' into tizen accepted/tizen/mobile/20151221.224239 accepted/tizen/tv/20151221.224256 accepted/tizen/wearable/20151221.224316 submit/tizen/20151221.115041
authorHyunjin Park <hj.na.park@samsung.com>
Mon, 21 Dec 2015 11:39:44 +0000 (20:39 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Mon, 21 Dec 2015 11:39:44 +0000 (20:39 +0900)

Trivial merge