am 42843c3c: Merge "Fix Throttle Notification intents" into froyo

Merge commit '42843c3ceb8b17e860112f8f2718cda40de15839' into froyo-plus-aosp

* commit '42843c3ceb8b17e860112f8f2718cda40de15839':
  Fix Throttle Notification intents