tree 460029d2d9c8da53c2294097e08435e20eab99c5
parent f158a7d29eebe2bd07708bc63cff396c3322f73c
parent da1fcf7ab2c0f63c85fa0d2596fc64699225989e
author Tianjie Xu <xunchang@google.com> 1495652194 +0000
committer android-build-merger <android-build-merger@google.com> 1495652194 +0000

Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" am: 9c1a114789 am: 66f02b4e71 am: aef046255a
am: da1fcf7ab2

Change-Id: Icad68a225061426e396541d0f67374a530f1dcb3