Merge "Fix usage of internal mockito API"

am: 5666119e79

Change-Id: I5e3242045e223702bd16df895fe204543cd9c05b
This commit is contained in:
Philip P. Moltmann
2018-09-07 09:27:04 -07:00
committed by android-build-merger

Diff Content Not Available