From: Igor Olshevskyi <i.olshevskyi@samsung.com>
Date: Mon, 3 Jul 2017 12:22:33 +0000 (+0300)
Subject: Merge branch 'tizen_dev' into tizen
X-Git-Tag: submit/tizen/20170703.150902^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c272af9fde05c98ab1f285ca67ed35d4f2ce3aac;p=profile%2Fwearable%2Fapps%2Fnative%2Fcall-ui.git

Merge branch 'tizen_dev' into tizen

Conflicts:
	tizen-manifest.xml

Change-Id: I0febbc401e2ee1b763a94c60f40f351f611dd439
---

c272af9fde05c98ab1f285ca67ed35d4f2ce3aac
diff --cc tizen-manifest.xml
index a5eeec3,c0e14d6..6a76d4d
--- a/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>