Merge "frameworks/base: Fix to release references in ActivityManagerService" into gingerbread

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

@@ -9093,6 +9093,14 @@ public final class ActivityManagerService extends ActivityManagerNative
             if (DEBUG_SERVICE) Slog.v(
                 TAG, "Removed service that is not running: " + r);
         }
+
+        if (r.bindings.size() > 0) {
+            r.bindings.clear();
+        }
+
+        if (r.restarter instanceof ServiceRestarter) {
+           ((ServiceRestarter)r.restarter).setService(null);
+        }
     }
 
     ComponentName startServiceLocked(IApplicationThread caller,