Merge "Fix usage of internal mockito API" am: 5666119e79
am: a51e37783a
Change-Id: I4fe963d0628fa808881f94ce8f0d5fb9b79492f1
This commit is contained in:
5666119e79
am: a51e37783a
Change-Id: I4fe963d0628fa808881f94ce8f0d5fb9b79492f1