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

am: cbd53dca91

* commit 'cbd53dca9159679a5c5ba06d9ca6e9607ca86fc4':
  Replace Log.wtf by Log.e

Change-Id: I2e039cdc9d35bcce822b85b53f05a70caec3317c

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

@@ -18859,7 +18859,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