tree 11bcf73d59b15559d340e343b47a39aaf7b583bd
parent 013ecbfca236f3b4c2fd0eedd89c70f116f641ed
parent b81df8e3a2f72546508fcdf92adc39cfa2985c56
author Brett Chabot <brettchabot@android.com> 1256755062 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256755062 -0700

am b81df8e3: Merge change I5535bbdf into eclair

Merge commit 'b81df8e3a2f72546508fcdf92adc39cfa2985c56' into eclair-mr2

* commit 'b81df8e3a2f72546508fcdf92adc39cfa2985c56':
  Disable flaky and failing tests.