Merge branch 'tizen_3.0' into tizen accepted/tizen/mobile/20150708.015027 accepted/tizen/tv/20150708.015130 accepted/tizen/wearable/20150708.015223 submit/tizen/20150702.103311
authorHyunjin Park <hj.na.park@samsung.com>
Tue, 7 Jul 2015 10:12:10 +0000 (19:12 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Tue, 7 Jul 2015 10:12:10 +0000 (19:12 +0900)

Trivial merge