Merge branch 'tizen_3.0' into tizen accepted/tizen/mobile/20150721.001033 accepted/tizen/tv/20150721.001045 accepted/tizen/wearable/20150721.001103 submit/tizen_mobile/20150720.124131 submit/tizen_tv/20150720.124123 submit/tizen_wearable/20150720.124140
authorHyunjin Park <hj.na.park@samsung.com>
Mon, 20 Jul 2015 12:25:02 +0000 (21:25 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Mon, 20 Jul 2015 12:25:02 +0000 (21:25 +0900)

Trivial merge