tree 49b294b8f3507b22f257504808d2f54b00c1a7ab
parent 0abe9860d8a6fcaa038a5c793ad9586547680423
parent aef046255a84592c238855df44f094146c12dd40
author Tianjie Xu <xunchang@google.com> 1495652044 +0000
committer android-build-merger <android-build-merger@google.com> 1495652044 +0000

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

Change-Id: Ib9ce75418ca56c2bb9fa68719371628b1763aa03