tree 10c6b199f78df10ae439b02fd72d0aab192545f1
parent 771904bf39226698717796d2a3625db72ea61d88
parent 6b0a1f60ab27faecaf9f58b65ca42f12703217e2
author Luca Milanesio <luca.milanesio@gmail.com> 1625566078 +0100
committer Luca Milanesio <luca.milanesio@gmail.com> 1625566078 +0100

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Fix BlockedThreadsCheck failing with un-blocked threads
  Use Guice injector for BlockedThreadsCheck in tests

Change-Id: I78e1622bb79c6191802e5622b6185b3cdb94fa50