am 3ded587c: am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1

* commit '3ded587cc199d4ba592e675dc47fb80a28d1dacd':
This commit is contained in:
Tsu Chiang Chuang
2012-02-13 14:39:48 -08:00
committed by Android Git Automerger

Diff Content Not Available