Merge branch 'master', remote-tracking branch 'origin/tizen' into tizen accepted/tizen/mobile/20150701.121111 accepted/tizen/tv/20150701.121449 accepted/tizen/wearable/20150701.122944 submit/tizen/20150701.090258
authorEunji, Lee <eunjieji.lee@samsung.com>
Wed, 1 Jul 2015 09:02:16 +0000 (18:02 +0900)
committerEunji, Lee <eunjieji.lee@samsung.com>
Wed, 1 Jul 2015 09:02:16 +0000 (18:02 +0900)

Trivial merge