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

Commit f914a890 authored by Ed Heyl's avatar Ed Heyl
Browse files

fix conflict markers 

Change-Id: I0b95da6a8cb461dfaf7db026b6d190e2dcbe6935
parent b6d305ec

api/current.txt

+0 −6
Original line number Diff line number Diff line
@@ -7003,13 +7003,7 @@ package android.content { 
    field public static final java.lang.String DISPLAY_SERVICE = "display";

    field public static final java.lang.String DOWNLOAD_SERVICE = "download";

    field public static final java.lang.String DROPBOX_SERVICE = "dropbox";

<<<<<<< HEAD

    field public static final java.lang.String FINGERPRINT_SERVICE = "fingerprint";

    field public static final java.lang.String HDMI_CEC_SERVICE = "hdmi_cec";

||||||| merged common ancestors

    field public static final java.lang.String HDMI_CEC_SERVICE = "hdmi_cec";

=======

>>>>>>> 4ce22057e48f7ca176057a9410bfcbbfd913cfde

    field public static final java.lang.String HDMI_CONTROL_SERVICE = "hdmi_control";

    field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method";

    field public static final java.lang.String INPUT_SERVICE = "input";