tree 28d383216dfee4811a0ce25899c23823fe22ca40
parent 08a4971cafc4672b86b17cd2b9812fbbd52d82c9
author Francois Ferrand <thetypz@gmail.com> 1608798915 +0100
committer David Ostrovsky <david@ostrovsky.org> 1609169690 +0100

Adapt to API changes in 3.1

Also avoid importing Id classes directly.

Change-Id: I40945e75ace97168727f0310d7705ebe0897d26c