merge 4ce22057, regen api/current.txt

Change-Id: I39186b5c4d41753c729c5d1ee7ee96b03a45c514

diff --cc Android.mk
Simple merge

diff --cc api/current.txt
index 8731a0e,1516e2a..dbc0945
--- 1/api/current.txt
--- 2/api/current.txt
+++ b/api/current.txt
@@@ -7003,8 -6992,6 +7003,13 @@@ 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";

diff --cc core/java/android/app/ContextImpl.java
Simple merge

diff --cc core/java/android/content/Context.java
Simple merge

diff --cc services/java/com/android/server/SystemServer.java
index 18ece5b,2aa1220..bb61b81
--- 1/services/java/com/android/server/SystemServer.java
--- 2/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@@ -127,11 -126,9 +127,9 @@@ public final class SystemServer 
      private static final String WIFI_SERVICE_CLASS =
              "com.android.server.wifi.WifiService";
      private static final String WIFI_PASSPOINT_SERVICE_CLASS =
 -            "com.android.server.wifi.passpoint.PasspointService";
 +            "com.android.server.wifi.passpoint.WifiPasspointService";
      private static final String WIFI_P2P_SERVICE_CLASS =
              "com.android.server.wifi.p2p.WifiP2pService";
-     private static final String HDMI_CEC_SERVICE_CLASS =
-             "com.android.server.hdmi.HdmiCecService";
      private static final String ETHERNET_SERVICE_CLASS =
              "com.android.server.ethernet.EthernetService";
      private static final String TASK_SERVICE_CLASS =