Merge branch 'tizen_3.0' into tizen accepted/tizen/mobile/20160114.012502 accepted/tizen/tv/20160114.012524 accepted/tizen/wearable/20160114.012541 submit/tizen/20160113.110151
authorHyunjin Park <hj.na.park@samsung.com>
Wed, 13 Jan 2016 10:47:10 +0000 (19:47 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Wed, 13 Jan 2016 10:47:10 +0000 (19:47 +0900)

Trivial merge