Merge branch 'tizen_3.0' into tizen accepted/tizen/mobile/20150803.235958 accepted/tizen/tv/20150804.000006 accepted/tizen/wearable/20150804.000017 submit/tizen/20150803.120551
authorHyunjin Park <hj.na.park@samsung.com>
Mon, 3 Aug 2015 11:55:52 +0000 (20:55 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Mon, 3 Aug 2015 11:55:52 +0000 (20:55 +0900)

Trivial merge