commit | 2b0ee6cae346936c3e6ecdb42abaff60d5a10833 | [log] [tgz] |
---|---|---|
author | Philip P. Moltmann <moltmann@google.com> | Fri Sep 07 09:27:04 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Sep 07 09:27:04 2018 -0700 |
tree | 8e0ab8bbc3155bfaa29cc85622e177df035f4ea4 | |
parent | de5e2f221d230ebfd5e2d3c3835c1037ef816df6 [diff] | |
parent | 5666119e79c9e8f3cc7e90c5161409d5afdca8b5 [diff] |
Merge "Fix usage of internal mockito API" am: 5666119e79 Change-Id: I5e3242045e223702bd16df895fe204543cd9c05b