am 4302886f: am c91f9fe5: Merge "Avoiding cyclic references when unbinding from a service" into gingerbread

* commit '4302886f8f77c3f53cdc094069f3550dd56bc812':
  Avoiding cyclic references when unbinding from a service