am fa74f7e0: am bba948dc: Merge "Delay AccountManagerService initialization" into...

* commit 'fa74f7e04fcad1258a1b85515547dba0466086d8':
  Delay AccountManagerService initialization

diff --cc services/java/com/android/server/SystemServer.java
index d766afd,e55e7fe..cd00255
--- 1/services/java/com/android/server/SystemServer.java
--- 2/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@@ -114,9 -114,10 +114,11 @@@ class ServerThread extends Thread 
                  : Integer.parseInt(factoryTestStr);
          final boolean headless = "1".equals(SystemProperties.get("ro.config.headless", "0"));
  
+         AccountManagerService accountManager = null;
+         ContentService contentService = null;
          LightsService lights = null;
          PowerManagerService power = null;
 +        DisplayManagerService display = null;
          BatteryService battery = null;
          VibratorService vibrator = null;
          AlarmManagerService alarm = null;