Merge branch 'tizen_2.2_deviceapi' into tizen_2.2

Change-Id: Icf3006af11b7212be907e996157157b3d774baed

diff --cc tct-alarm-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-appcontrol-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-application-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-bluetooth-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-bookmark-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-calendar-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-callhistory-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-contact-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-content-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-content-tizen-tests/tct-content-tizen-tests.spec
Simple merge

diff --cc tct-datacontrol-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-datasync-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-download-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-filesystem-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-messageport-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-messaging-email-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-messaging-mms-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-messaging-sms-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-namespace-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-networkbearerselection-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-nfc-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-notification-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-package-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-power-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-push-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-secureelement-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-security-tcs-tests/config.xml.wgt
Simple merge

diff --cc tct-systeminfo-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-systemsetting-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-time-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-tizen-tizen-tests/config.xml.wgt
Simple merge

diff --cc tct-websetting-tizen-tests/config.xml.wgt
Simple merge