diff options
| author | James Dong <jdong@google.com> | 2011-06-10 10:32:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-10 10:32:21 -0700 |
| commit | 0964c759d3391b760f2aced79b2dab5186f908eb (patch) | |
| tree | 486fe6ae59124ed6d65cef75737785dbe14f539b /tools/aidl/generate_java.cpp | |
| parent | 8df5fcfa621ff40fd4a845804b02464dd9db5e86 (diff) | |
| parent | dc03da0444803983aef4988475f2d5dcdf0283e9 (diff) | |
am dc03da04: (-s ours) am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2
* commit 'dc03da0444803983aef4988475f2d5dcdf0283e9':
Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions