Merge branch 'tizen_3.0' into tizen accepted/tizen/mobile/20151231.072747 accepted/tizen/tv/20151231.072805 accepted/tizen/wearable/20151231.072828 submit/tizen/20151231.020517
authorHyunjin Park <hj.na.park@samsung.com>
Thu, 31 Dec 2015 01:59:04 +0000 (10:59 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Thu, 31 Dec 2015 01:59:04 +0000 (10:59 +0900)

Trivial merge