tree 228156e296565d168a4777f263205c9b8181a23d
parent cf5a2e36745ecbadbd5ca5193e04acb967ff5be8
parent b1f9c6200a287d83c79f275102fbb55d3f41d54f
author Philip P. Moltmann <moltmann@google.com> 1536339297 -0700
committer android-build-merger <android-build-merger@google.com> 1536339297 -0700

Merge "Fix usage of internal mockito API" am: 5666119e79 am: a51e37783a
am: b1f9c6200a

Change-Id: I6b578a227da1ac8d434de99143610b7c243ee159