tree d5a0b14954cc4b07fd6497075a90fdb9e7135375
parent a5636087cb17a3d4d2450736d6382da682cc1fa9
parent 17e8c41d5e7b83c419a52a6f7da0ad3ade514f76
author Nasser Grainawi <nasser@codeaurora.org> 1614280617 -0700
committer Nasser Grainawi <nasser@codeaurora.org> 1614280617 -0700

Merge branch 'stable-3.1' into stable-3.2

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

Change-Id: I6dbeaa0d21545a1903bdb11c5de5d9e8f72079c5