tree eeb734fb7474a0db4e2d981496117a9b557f221f
parent 872137e5360288b4932909943426fe43ef302d43
parent 65a7c6845dee507cfbb94e64245583055bd0957d
author Paul Duffin <paulduffin@google.com> 1489103971 +0000
committer android-build-merger <android-build-merger@google.com> 1489103971 +0000

Refactor code incompatible with Mockito 2.7.13 am: d529415c68
am: 65a7c6845d

Change-Id: Ic09f2a1f08441c9e44612b2f2a63902f7e12764c