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

Commit 30cd1890 authored by Walter Jang's avatar Walter Jang
Browse files

resolve merge conflicts of 99397b27 to master 

Change-Id: Iec86337f1fc84c8c7102428211adf58bb77edee4
parents 0cb0dd96 99397b27

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
    android:versionName="1.5.5">



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



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



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