Merge branch 'master' into tizen accepted/tizen/common/20160504.125859 accepted/tizen/ivi/20160504.011242 accepted/tizen/mobile/20160504.011147 accepted/tizen/tv/20160504.011208 accepted/tizen/wearable/20160504.011223 submit/tizen/20160503.075323
authorEunji, Lee <eunjieji.lee@samsung.com>
Tue, 3 May 2016 07:51:53 +0000 (16:51 +0900)
committerEunji, Lee <eunjieji.lee@samsung.com>
Tue, 3 May 2016 07:51:53 +0000 (16:51 +0900)

Trivial merge