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

* commit '8885596a9109794ebd61e6a91e5199aa1750ed8c':
This commit is contained in:
Tsu Chiang Chuang 2012-02-13 14:42:42 -08:00 committed by Android Git Automerger
commit a1b75b885d

Diff Content Not Available