Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8efc786a authored by Tingting Wang's avatar Tingting Wang Committed by android-build-merger
Browse files

Merge "[DO NOT MERGE] Bump Contacts to 1.4.21 and targetSdkVersion as 24." into nyc-mr1-dev 

am: 88406020

* commit '88406020':
  [DO NOT MERGE] Bump Contacts to 1.4.21 and targetSdkVersion as 24.

Change-Id: I01013306544a00fa54aae50a97bce8579ee61cf9
parents f7edfad7 88406020

AndroidManifest.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -16,10 +16,10 @@ 




<manifest xmlns:android="http://schemas.android.com/apk/res/android"

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.contacts"

    package="com.android.contacts"

    android:versionCode="10420"

    android:versionCode="10421"

    android:versionName="1.4.20">

    android:versionName="1.4.21">





    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="23" />

    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="24" />

    <original-package android:name="com.android.contacts" />

    <original-package android:name="com.android.contacts" />





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

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

tests/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ 




    <uses-sdk

    <uses-sdk

        android:minSdkVersion="21"

        android:minSdkVersion="21"

        android:targetSdkVersion="23" />

        android:targetSdkVersion="24" />





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

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

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

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