Merge branch 'master' into tizen accepted/tizen/common/20160526.145909 accepted/tizen/ivi/20160602.020647 accepted/tizen/mobile/20160602.020600 accepted/tizen/tv/20160602.020612 accepted/tizen/wearable/20160602.020635 submit/tizen/20160524.091253
authorEunji, Lee <eunjieji.lee@samsung.com>
Tue, 24 May 2016 09:11:41 +0000 (18:11 +0900)
committerEunji, Lee <eunjieji.lee@samsung.com>
Tue, 24 May 2016 09:11:41 +0000 (18:11 +0900)

Trivial merge