| commit | 9bd980ac6729cf2f0a5da520f49571bcfca5a3f7 | [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 | 29bbf39e6ff004477b6949327165181486dffbd5 | |
| parent | 0e9befbf4b0e7a76c84ed4954bab033b253b2c5e [diff] | |
| parent | aeae766c4c5fdb432de14bba3a9d7de6ad97b5bb [diff] |
am 750f3211: am c9b6851a: Throttling framework addins Merge commit '750f32117b96a8af4fb03fae459a80f79a667fca' into kraken * commit '750f32117b96a8af4fb03fae459a80f79a667fca': Throttling framework addins