| commit | c96b669013a790c84e63e28257ab4ca07306e73c | [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 | f3e258f295cd8e0ffb0d0f639d0ae42a5f867fe1 | |
| parent | 5ff79c3b06d7087153617dc973491fc890700af5 [diff] | |
| parent | 9add122296d3b252bdb1b377326870e4413a68d9 [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