| commit | d99540d7a20328907d38b26c66b8e9585f4d3c28 | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Thu Apr 08 17:05:06 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 08 17:05:06 2010 -0700 |
| tree | 86a9ad75320b828148a667c7a0f008627d171026 | |
| parent | b059dc9c89c08be299ffc424340a2ec85cb39a5b [diff] | |
| parent | 750f32117b96a8af4fb03fae459a80f79a667fca [diff] |
am 750f3211: am c9b6851a: Throttling framework addins Merge commit '750f32117b96a8af4fb03fae459a80f79a667fca' into kraken * commit '750f32117b96a8af4fb03fae459a80f79a667fca': Throttling framework addins