tree c19a346e89f714312e3d124f0f222e9ae8fd544c
parent 31431b34f895862ae13efba30bb5771085572687
parent 19681af44b7c7494ae8de28dab8aacc3e9d92390
author Robert Greenwalt <robdroid@android.com> 1272305925 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1272305925 -0700

am 19681af4: Merge "Handle throttling being disabled via policy change" into froyo

Merge commit '19681af44b7c7494ae8de28dab8aacc3e9d92390' into froyo-plus-aosp

* commit '19681af44b7c7494ae8de28dab8aacc3e9d92390':
  Handle throttling being disabled via policy change