resolved conflicts for merge of 33264596 to ics-aah

Change-Id: I1b0b2c3a63d97d49940666ceec71293bdbab4e2e
2011-08-25 09:57:48 -07:00
parent cbb8b45088 332645960c
commit df6bb0a7ee
11 changed files with 331 additions and 122 deletions
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -6571,7 +6571,7 @@ public final class ActivityManagerService extends ActivityManagerNative
                            i--;
                        }
                    }
-                    
+
                    for (int i=0; i<ris.size(); i++) {
                        ActivityInfo ai = ris.get(i).activityInfo;
                        ComponentName comp = new ComponentName(ai.packageName, ai.name);