Merge branch 'master', remote-tracking branch 'origin/tizen' into tizen accepted/tizen/common/20160224.090717 accepted/tizen/ivi/20160219.002539 accepted/tizen/mobile/20160219.002444 accepted/tizen/tv/20160219.002500 accepted/tizen/wearable/20160219.002520 submit/tizen/20160218.101653 submit/tizen_common/20160223.134137 submit/tizen_common/20160223.144503
authorEunji, Lee <eunjieji.lee@samsung.com>
Thu, 18 Feb 2016 10:09:32 +0000 (19:09 +0900)
committerEunji, Lee <eunjieji.lee@samsung.com>
Thu, 18 Feb 2016 10:09:32 +0000 (19:09 +0900)

Trivial merge