commit | 8d6968dc160d5570b8705e45a19c9e6b8c824733 | [log] [tgz] |
---|---|---|
author | Takayuki Hoshi <hoshi@google.com> | Fri Jan 23 08:45:54 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 23 08:45:54 2015 +0000 |
tree | 5a9640822e3372bfee0add7ba282c2c2eb55e004 | |
parent | 471480186f6e77242a706e5399689f328968a33d [diff] | |
parent | e347f5e272eac39dcc008ec7bf0db388b47a2754 [diff] |
am e347f5e2: am 5bbff433: Merge "Slightly relax the timeout condition for testMinimumDownload" into lmp-sprout-dev * commit 'e347f5e272eac39dcc008ec7bf0db388b47a2754': Slightly relax the timeout condition for testMinimumDownload