Merge "Avoiding cyclic references when unbinding from a service" into gingerbread

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

@@ -9775,6 +9775,7 @@ public final class ActivityManagerService extends ActivityManagerNative
                 if (DEBUG_SERVICE) Slog.v(TAG,
                         "doneExecuting remove stopping " + r);
                 mStoppingServices.remove(r);
+                r.bindings.clear();
             }
             updateOomAdjLocked(r.app);
         }