tree c913df5aadc552564b50ad3162cd83a3e1c160cd
parent a62dfe9e49ea785c4be2173479e4472767771ce5
parent 50395e80718e77d27ec5e2d474b255e05de68d82
author Dianne Hackborn <hackbod@google.com> 1282779237 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282779237 -0700

am 50395e80: Merge "Fix a fun bug with multiple service bindings from an activity." into gingerbread

Merge commit '50395e80718e77d27ec5e2d474b255e05de68d82' into gingerbread-plus-aosp

* commit '50395e80718e77d27ec5e2d474b255e05de68d82':
  Fix a fun bug with multiple service bindings from an activity.