tree a8eb7981dfadac7f310d4ab15b3b9b839a5d789c
parent 699399775f609c02cd4f29b33b6fde451959fa65
parent 32ebaf57d8646542b80e848441830a5ef834aed3
author Robert Greenwalt <robdroid@android.com> 1271378726 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1271378726 -0700

am 32ebaf57: am e80c6f49: Merge "Add multi-sim support to ThrottleService." into froyo

Merge commit '32ebaf57d8646542b80e848441830a5ef834aed3' into kraken

* commit '32ebaf57d8646542b80e848441830a5ef834aed3':
  Add multi-sim support to ThrottleService.