tree 0950697a53de9f2216ed0a5f8706c9c5aaff4ce9
parent dcde3a8abec3d2d9c1261fef5fb6015c16382346
parent fde7fdd38d45e6bdb12cba9917a23d18e9f3457c
author Dianne Hackborn <hackbod@google.com> 1282779655 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282779655 -0700

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

Merge commit 'fde7fdd38d45e6bdb12cba9917a23d18e9f3457c'

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