tree 70c16bfaeb80c6fc870aa9817ce6ee92fde94a9e
parent 471bf958cd86c5535b629edd12e8a2380963e5d0
parent bc946c65213a131d672f0f897989d71177d32ea4
author Sami Tolvanen <samitolvanen@google.com> 1446146442 +0000
committer android-build-merger <android-build-merger@google.com> 1446146442 +0000

Merge "Error correction: Use block_image_recover in block OTAs" am: fe4e86c7fd am: a25cced65f
am: bc946c6521

* commit 'bc946c65213a131d672f0f897989d71177d32ea4':
  Error correction: Use block_image_recover in block OTAs