Merge branch 'master' into tizen accepted/tizen/ivi/20160223.234548 accepted/tizen/mobile/20160112.043244 accepted/tizen/tv/20160112.043308 accepted/tizen/wearable/20160112.043326 submit/tizen/20160112.015433 submit/tizen_common/20160218.142243 submit/tizen_ivi/20160217.000000 submit/tizen_ivi/20160223.000000
authorjoon.c.baek <joon.c.baek@samsung.com>
Tue, 12 Jan 2016 01:53:54 +0000 (10:53 +0900)
committerjoon.c.baek <joon.c.baek@samsung.com>
Tue, 12 Jan 2016 01:53:54 +0000 (10:53 +0900)

Trivial merge