Merge branch 'tizen_3.0' into tizen accepted/tizen/mobile/20160111.052548 accepted/tizen/tv/20160111.052638 accepted/tizen/wearable/20160111.052711 submit/tizen/20160111.002222
authorHyunjin Park <hj.na.park@samsung.com>
Sun, 10 Jan 2016 23:20:17 +0000 (08:20 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Sun, 10 Jan 2016 23:20:17 +0000 (08:20 +0900)

Trivial merge