Merge "Replace Log.wtf by Log.e" into nyc-dev am: be2527b964 am: cbd53dca91

am: 5553ac4d3b

* commit '5553ac4d3b37aecaca25267849634f3812ee03ab':
  Replace Log.wtf by Log.e

Change-Id: I42fc946ffd8ee8480064295d6a34e42c940c4772

services/core/java/com/android/server/am/ActivityManagerService.java

@@ -18863,7 +18863,7 @@ public final class ActivityManagerService extends ActivityManagerNative
             for (int j = 0; j < activitiesSize; j++) {
                 final ActivityRecord r = app.activities.get(j);
                 if (r.app != app) {
-                    Log.wtf(TAG, "Found activity " + r + " in proc activity list using " + r.app
+                    Log.e(TAG, "Found activity " + r + " in proc activity list using " + r.app
                             + " instead of expected " + app);
                     if (r.app == null || (r.app.uid == app.uid)) {
                         // Only fix things up when they look sane