am ed009be9: (-s ours) DO NOT MERGE. Merge commit \'4602bf9d\' into mergeit
authorJeff Sharkey <jsharkey@android.com>
Fri, 8 Mar 2013 19:04:20 +0000 (11:04 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 8 Mar 2013 19:04:20 +0000 (11:04 -0800)
commit21f5f3516e88e1a237be21e0bd4b07c903310cde
tree2f771d9f1b98ad9ea34baac87e1c7ca5bb4ca4e7
parentb0bb182a1b52b31ccf1ec5e0be82308ebb4857e2
parented009be9799ddfe554745c8aeb8f2ad47a10945b
am ed009be9: (-s ours) DO NOT MERGE. Merge commit \'4602bf9d\' into mergeit

* commit 'ed009be9799ddfe554745c8aeb8f2ad47a10945b':
  Fix large file download failure issue