Merge "Change manifest file by default" into tizen accepted/tizen/mobile/20150701.121127 accepted/tizen/tv/20150701.121502 accepted/tizen/wearable/20150701.122955 submit/tizen/20150701.093032 submit/tizen/20150703.034127
authorhj kim <backto.kim@samsung.com>
Wed, 1 Jul 2015 09:29:44 +0000 (02:29 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 1 Jul 2015 09:29:44 +0000 (02:29 -0700)

Trivial merge