Merge tag 'android-5.1.0_r3' of...

# Build the Telecom service.

include $(CLEAR_VARS)

LOCAL_JAVA_LIBRARIES := \

        telephony-common

LOCAL_STATIC_JAVA_LIBRARIES := \

        guava \

LOCAL_JAVA_LIBRARIES := telephony-common

LOCAL_SRC_FILES := $(call all-java-files-under, src)

         can check for incompatible APIs. -->

    <uses-sdk android:minSdkVersion="19" />

    <application android:persistent="true"

            android:label="@string/telecommAppLabel"

    <application android:label="@string/telecommAppLabel"

            android:icon="@mipmap/ic_launcher_phone"

            android:allowBackup="false"

            android:supportsRtl="true">

            android:supportsRtl="true"

            android:process="system">

        <!-- CALL vs CALL_PRIVILEGED vs CALL_EMERGENCY

             We have three different intents through which a call can be initiated each with its

        <activity android:name=".RespondViaSmsSettings$Settings"

                  android:label="@string/respond_via_sms_setting_title"

                  android:configChanges="orientation|screenSize|keyboardHidden"

                  android:theme="@style/Theme.Telecom.DialerSettings"

                  android:process=":ui">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

            </intent-filter>

        </service>

        <service android:name=".TelecomService"

                android:singleUser="true"

                android:process="system">

            <intent-filter>

                <android android:name="android.telecom.ITelecomService" />

            </intent-filter>

        </service>

    </application>

</manifest>