Merge branch 'master' into tizen accepted/tizen/common/20160511.141931 accepted/tizen/ivi/20160512.050452 accepted/tizen/mobile/20160512.050444 accepted/tizen/tv/20160512.050449 accepted/tizen/wearable/20160512.050428 submit/tizen/20160510.111553
authorEunji, Lee <eunjieji.lee@samsung.com>
Tue, 10 May 2016 11:14:03 +0000 (20:14 +0900)
committerEunji, Lee <eunjieji.lee@samsung.com>
Tue, 10 May 2016 11:14:03 +0000 (20:14 +0900)

Trivial merge