Merge change 5787 into donut

* changes:
  Fix http://code.google.com/p/android/issues/detail?id=3059