| commit | a1b75b885ddb57639811fd67c29bdc51413b303a | [log] [tgz] |
|---|---|---|
| author | Tsu Chiang Chuang <tsu@google.com> | Mon Feb 13 14:42:42 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 13 14:42:42 2012 -0800 |
| tree | f200e6c9f63d54186a2ecb6ea93f42b819cb41b4 | |
| parent | a118238405c163cdaedb9077abd53cd7f3982eba [diff] | |
| parent | 18c64569c83afcd95247bbd1920596051fa2bc5a [diff] |
am 8885596a: am 3ded587c: am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1 * commit '8885596a9109794ebd61e6a91e5199aa1750ed8c':