Merge branch 'master' into tizen accepted/tizen/ivi/20160218.022807 accepted/tizen/mobile/20160202.115338 accepted/tizen/tv/20160202.115347 accepted/tizen/wearable/20160202.115409 submit/tizen/20160202.080640 submit/tizen_ivi/20160217.000000 submit/tizen_ivi/20160217.000001
authorHyunjin Park <hj.na.park@samsung.com>
Tue, 2 Feb 2016 07:45:30 +0000 (16:45 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Tue, 2 Feb 2016 07:45:30 +0000 (16:45 +0900)

Trivial merge