tree 23d924de3f4bbe73386ac66583f58217d3e0cf86
parent da81c0d85c54c0e2ed3534f147fc863b10e98e85
parent a1ba743962c2fc304a86611e012ae3363701d8ee
author Paul Duffin <paulduffin@google.com> 1489131587 +0000
committer android-build-merger <android-build-merger@google.com> 1489131587 +0000

Refactor code incompatible with Mockito 2.7.13
am: a1ba743962

Change-Id: I0b6870f3923c7e4e3c3d25de8114910bc3acda28