am ebf9465d: resolved conflicts for merge of ef57e5e0 to stage-aosp-master

* commit 'ebf9465d213336819b15e3b21d02afce64470d4f':
  Add trace code to system server.

diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge

diff --cc services/java/com/android/server/SystemServer.java
index 7a8d4ef,52817e0..0e553b5
--- 1/services/java/com/android/server/SystemServer.java
--- 2/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@@ -875,15 -929,10 +929,15 @@@ public final class SystemServer 
                  if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_VOICE_RECOGNIZERS)) {
                      mSystemServiceManager.startService(VOICE_RECOGNITION_MANAGER_SERVICE_CLASS);
                  }
 +
 +                if (GestureLauncherService.isGestureLauncherEnabled(context.getResources())) {
 +                    Slog.i(TAG, "Gesture Launcher Service");
 +                    mSystemServiceManager.startService(GestureLauncherService.class);
 +                }
              }
  
+             traceBeginAndSlog("StartDiskStatsService");
              try {
-                 Slog.i(TAG, "DiskStats Service");
                  ServiceManager.addService("diskstats", new DiskStatsService(context));
              } catch (Throwable e) {
                  reportWtf("starting DiskStats Service", e);