tree a2dcc84af4f528f8ee76fc5c58f4d164c5c1d5a7
parent 2f29ef1c4c7c9893af0638ebc575cbd4b369118c
parent 16d00cdf95a0e04db345512fcd48c8ec3d867449
author Nasser Grainawi <nasser@codeaurora.org> 1614279848 -0700
committer Nasser Grainawi <nasser@codeaurora.org> 1614279848 -0700

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Call retryDone() when giving up after lock failures
  Fix issue with task cleanup after retry

Change-Id: Id9ce63cd6112b3c8b16f9daafe3a8a982521baa9