Merge branch 'master', remote-tracking branch 'origin/tizen' accepted/tizen/mobile/20150630.195215 accepted/tizen/tv/20150630.195400 accepted/tizen/wearable/20150630.195544 submit/tizen/20150630.082257
authorEunji, Lee <eunjieji.lee@samsung.com>
Tue, 30 Jun 2015 08:18:42 +0000 (17:18 +0900)
committerEunji, Lee <eunjieji.lee@samsung.com>
Tue, 30 Jun 2015 08:18:42 +0000 (17:18 +0900)

Trivial merge