diff options
| -rw-r--r-- | api/current.txt | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index 13783a6329b8..62e14d38f846 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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"; |