2f8c9e6825
Merge commit 'f06f2eb2d646789d723d4a08d0681cae5b40b768' into froyo-plus-aosp * commit 'f06f2eb2d646789d723d4a08d0681cae5b40b768': Misc fixes for throttling.