Merge branch 'master' into tizen accepted/tizen/mobile/20160217.011051 accepted/tizen/tv/20160217.011101 accepted/tizen/wearable/20160217.011128 submit/tizen/20160216.105812 submit/tizen_common/20160218.142243
authorHyunjin Park <hj.na.park@samsung.com>
Tue, 16 Feb 2016 10:42:20 +0000 (19:42 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Tue, 16 Feb 2016 10:42:20 +0000 (19:42 +0900)

Trivial merge