am 0ba62525: am 2b534e77: Merge "Fix broken data retry" into honeycomb-LTE

* commit '0ba625259e8c4af3df2c7823fc1d18b42d760a44':
  Fix broken data retry