Merge branch 'master' into tizen accepted/tizen/mobile/20151223.235917 accepted/tizen/tv/20151223.235947 accepted/tizen/wearable/20151224.000012 submit/tizen/20151223.061216 submit/tizen_common/20151229.142028 submit/tizen_common/20151229.144031 submit/tizen_common/20151229.154718
authorjoon.c.baek <joon.c.baek@samsung.com>
Wed, 23 Dec 2015 06:10:51 +0000 (15:10 +0900)
committerjoon.c.baek <joon.c.baek@samsung.com>
Wed, 23 Dec 2015 06:10:51 +0000 (15:10 +0900)

Trivial merge