commit f1a6458c87056ca53d1f4c7df85231cfc0975b29
author Santos Cordon <santoscordon@google.com> Fri Nov 07 01:50:20 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 07 01:50:21 2014 +0000
tree 3e6e15799c0f52a78683409c16213b2101df9a01
parent 6f2c1ebb26b3e1837ac69dcc5394b365b32ea430
parent 2be04fc3c9c9d5ff14b67b06c0af6ea9422977b2

Merge "Telecom, Telephony share a process." into lmp-mr1-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 88e90ae..33c9838 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -57,7 +57,8 @@
             android:label="@string/telecommAppLabel"
             android:icon="@mipmap/ic_launcher_phone"
             android:allowBackup="false"
-            android:supportsRtl="true">
+            android:supportsRtl="true"
+            android:process="com.android.phone">
 
         <!-- CALL vs CALL_PRIVILEGED vs CALL_EMERGENCY
              We have three different intents through which a call can be initiated each with its