Merge branch 'tizen_3.0' into tizen accepted/tizen/tv/20150610.002145 accepted/tizen/wearable/20150610.002701 submit/tizen_mobile/20150609.113445 submit/tizen_tv/20150609.113453 submit/tizen_wearable/20150609.113502
authorHyunjin Park <hj.na.park@samsung.com>
Tue, 9 Jun 2015 11:29:38 +0000 (20:29 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Tue, 9 Jun 2015 11:29:38 +0000 (20:29 +0900)

Trivial merge