am d6b5cd19: Merge "Rename Internet calls SIP calls" into lmp-dev

* commit 'd6b5cd19fdd58c90ce51b397c621c1d89aa2e187':
  Rename Internet calls SIP calls
This commit is contained in:
Jay Shrauner
2014-08-08 21:39:02 +00:00
committed by Android Git Automerger

View File

@@ -2107,9 +2107,9 @@
<string name="permdesc_cache_filesystem">Allows the app to read and write the cache filesystem.</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permlab_use_sip">make/receive Internet calls</string>
<string name="permlab_use_sip">make/receive SIP calls</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permdesc_use_sip">Allows the app to use the SIP service to make/receive Internet calls.</string>
<string name="permdesc_use_sip">Allows the app to make and receive SIP calls.</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permlab_bind_call_service">interact with in-call screen</string>