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

Browse Source

* commit '08eb7dd630a2de8dd51a988a747da26ff9d3f8fb':
  extending timeout to stabilize tests

...

This commit is contained in:

Tsu Chiang Chuang 2012-02-13 13:42:45 -08:00 committed by Android Git Automerger

parent a4ebe8d29a 0137d87be0

commit c1720bacf3

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available