| commit | 4961295d19e27dd0854f2b07ae126f79ce935c8c | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Tue Apr 24 14:18:17 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 24 14:18:17 2012 -0700 |
| tree | ae5efda3f19666326d62709b3c99ba5fb953a423 | |
| parent | 231888990999e56a1d41162ead098b3e7ed21a45 [diff] | |
| parent | d7156d3f471976490bdc7c76f714aedbfa3e1682 [diff] |
Merge "Use the right timeout"