| commit | 9d82346e812c8e23463b51453bedf6a6c53c06d7 | [log] [tgz] |
|---|---|---|
| author | Tsu Chiang Chuang <tsu@google.com> | Mon Feb 13 14:45:23 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 13 14:45:23 2012 -0800 |
| tree | dd2c9c93fa0a40b05dd74e4c7c5370a28133bcd2 | |
| parent | 5f94ac79517912a0c785618e9a7a1748ffa6197e [diff] | |
| parent | 42a3e79d5ab5fb9d52b2bd3ea7d016d4b76e23e1 [diff] |
am 42a3e79d: am 8885596a: am 3ded587c: am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1 * commit '42a3e79d5ab5fb9d52b2bd3ea7d016d4b76e23e1':