Merge branch 'master' into tizen accepted/tizen/common/20160401.171258 accepted/tizen/ivi/20160402.022107 accepted/tizen/mobile/20160402.022025 accepted/tizen/tv/20160402.022037 accepted/tizen/wearable/20160402.022048 submit/tizen/20160401.122923
authorHyunjin Park <hj.na.park@samsung.com>
Fri, 1 Apr 2016 12:22:35 +0000 (21:22 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Fri, 1 Apr 2016 12:22:35 +0000 (21:22 +0900)

Trivial merge