Merge branch 'master' into tizen accepted/tizen/mobile/20151222.224842 accepted/tizen/tv/20151222.224859 accepted/tizen/wearable/20151222.224919 submit/tizen/20151222.122322 submit/tizen_common/20151229.142028 submit/tizen_common/20151229.144031 submit/tizen_common/20151229.154718
authorHyunjin Park <hj.na.park@samsung.com>
Tue, 22 Dec 2015 12:16:34 +0000 (21:16 +0900)
committerHyunjin Park <hj.na.park@samsung.com>
Tue, 22 Dec 2015 12:16:34 +0000 (21:16 +0900)

Trivial merge