tree ae5efda3f19666326d62709b3c99ba5fb953a423
parent 231888990999e56a1d41162ead098b3e7ed21a45
parent d7156d3f471976490bdc7c76f714aedbfa3e1682
author John Reck <jreck@google.com> 1335302297 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1335302297 -0700

Merge "Use the right timeout"