tree 6beb60503b9b6c6f9152154ec66bef205fb2952f
parent 86386dc73f51de404a1dd9c9156cd398a706f2e6
author David Ostrovsky <david@ostrovsky.org> 1555648311 -0700
committer David Pursehouse <dpursehouse@collab.net> 1571308968 +0900

Adapt to changes on recent master

Change-Id: I502b8fcd9cd81018cdbf1a3f603de1008a4fb4d7