am 21f5f351: am ed009be9: (-s ours) DO NOT MERGE. Merge commit \'4602bf9d\' into...
authorJeff Sharkey <jsharkey@android.com>
Fri, 8 Mar 2013 19:06:43 +0000 (11:06 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 8 Mar 2013 19:06:43 +0000 (11:06 -0800)
commit07dab9c7689ef85ef6a062f57c38bf4c3a8506bd
tree2f771d9f1b98ad9ea34baac87e1c7ca5bb4ca4e7
parent195b46b8a59eb522fc91ac6f498f359a337d3f3e
parent21f5f3516e88e1a237be21e0bd4b07c903310cde
am 21f5f351: am ed009be9: (-s ours) DO NOT MERGE. Merge commit \'4602bf9d\' into mergeit

* commit '21f5f3516e88e1a237be21e0bd4b07c903310cde':
  Fix large file download failure issue