am 834c2870: am fed7a99a: Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1

* commit '834c2870fa422098b3728ae26099b3030994f86f':
  Quick fix for bug 5646217 blocking automation tests
This commit is contained in:
Daniel Sandler 2011-11-29 05:54:09 -08:00 committed by Android Git Automerger
commit 5d0b591ae6

Diff Content Not Available