OSDN Git Service

am dc03da04: (-s ours) am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth...
authorJames Dong <jdong@google.com>
Fri, 10 Jun 2011 17:32:21 +0000 (10:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Jun 2011 17:32:21 +0000 (10:32 -0700)
commit7abe46bd9f374be0fb9da3dd4a414b73b69e120a
treea391a16652e856ed088baf870d69ccd2630df64f
parent6628fde5526f6ecce30db0c9ee1df6a2fe608152
parent4be896794d00915daf5d9ec9357c8c6b9c81284b
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."