| commit | 2af6048454f6f6aa9a4d7ccf5fccdb3f8d47ac27 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Thu Jan 29 18:36:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 18:36:48 2015 +0000 |
| tree | 0e04966b0c7bb58aa77a8017b3bd059e5bd38c64 | |
| parent | de3f8a1ed744eb89ae59b3fde9774a52802d2a4c [diff] | |
| parent | 46246e5b1725a8a1868dbd9f37fffe33c19672fc [diff] |
am 46246e5b: resolved conflicts for merge of 59d1d010 to lmp-mr1-dev-plus-aosp * commit '46246e5b1725a8a1868dbd9f37fffe33c19672fc': httplive: Dont resume if we have almost fetched till stop time