| commit | 1f3dcff8010c8b679eb32fc48ecf7dff131d4f56 | [log] [tgz] |
|---|---|---|
| author | Alon Albert <aalbert@google.com> | Thu Feb 24 09:20:46 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Feb 24 09:20:46 2011 -0800 |
| tree | 4de28f574a98aae400d6528b0d6fccc5fc65a9c4 | |
| parent | 9281fda8e0c2dd85bbf43f6de19ce80b2af375ac [diff] | |
| parent | b9ce99c940ef664ce86a991dd0fe2ac4194af675 [diff] |
Merge "DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead." into gingerbread