Merge branch 'atel.lnx.2.0.r5-rel' of...

    $(phone_common_dir)/src-N

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

LOCAL_SRC_FILES += src/org/codeaurora/presenceserv/IPresenceService.aidl \

                   src/org/codeaurora/presenceserv/IPresenceServiceCB.aidl

LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \

    $(support_library_root_dir)/v7/cardview/res \

    $(support_library_root_dir)/v7/recyclerview/res \

    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />

    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />

    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />

    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />

    <uses-permission android:name="android.permission.WAKE_LOCK" />

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <uses-permission android:name="android.permission.WRITE_SETTINGS" />

    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

    <uses-permission android:name="android.permission.BROADCAST_STICKY" />

    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

    <!-- This tells the activity manager to not delay any of our activity

     start requests, even if they happen immediately after the user

     presses home. -->

        </activity>

        <activity android:name="com.android.dialer.calllog.CallLogActivity"

            android:configChanges="orientation|screenSize|keyboardHidden"

            android:label="@string/call_log_activity_title"

            android:theme="@style/DialtactsThemeWithoutActionBarOverlay"

            android:icon="@mipmap/ic_launcher_phone">