Merge branch 'tizen_dev' into tizen

Conflicts:
	tizen-manifest.xml

Change-Id: I0febbc401e2ee1b763a94c60f40f351f611dd439

diff --cc tizen-manifest.xml
index a5eeec3e5f3f5dacae217148e94ebf0fd326d1e0,c0e14d6e0f18ac4ce664622d7978ad8c44dce90e..6a76d4d76749b1b7090ae10f3568258ab8e0fde8
--- 1/tizen-manifest.xml
--- 2/tizen-manifest.xml
+++ b/tizen-manifest.xml
@@@ -18,11 -17,14 +17,13 @@@
          <privilege>http://tizen.org/privilege/window.priority.set</privilege>
          <privilege>http://tizen.org/privilege/systemsettings.admin</privilege>
          <privilege>http://tizen.org/privilege/contact.read</privilege>
+         <privilege>http://tizen.org/privilege/display</privilege>
+         <privilege>http://tizen.org/privilege/telephony.admin</privilege>
+         <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
+         <privilege>http://tizen.org/privilege/volume.set</privilege>
          <privilege>http://tizen.org/privilege/message.write</privilege>
          <privilege>http://tizen.org/privilege/notification</privilege>
-         <privilege>http://tizen.org/privilege/display</privilege>
          <privilege>http://tizen.org/privilege/message.read</privilege>
-         <privilege>http://tizen.org/privilege/keygrab</privilege>
+         <privilege>http://tizen.org/privilege/callhistory.read</privilege>
 -        <privilege>http://tizen.org/privilege/display</privilege>
      </privileges>
  </manifest>