am 07dab9c7: am 21f5f351: am ed009be9: (-s ours) DO NOT MERGE. Merge commit \'4602bf9...
authorJeff Sharkey <jsharkey@android.com>
Fri, 8 Mar 2013 19:09:46 +0000 (11:09 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 8 Mar 2013 19:09:46 +0000 (11:09 -0800)
commit45f654d03476d9a2493e7fc5f7334bcc0a6c10e3
tree676f2501844882633a9b9f14324397cb8a8411c8
parent5ba69740a47857fcebd36866e07963ba798269d5
parent07dab9c7689ef85ef6a062f57c38bf4c3a8506bd
am 07dab9c7: am 21f5f351: am ed009be9: (-s ours) DO NOT MERGE. Merge commit \'4602bf9d\' into mergeit

* commit '07dab9c7689ef85ef6a062f57c38bf4c3a8506bd':
  Fix large file download failure issue