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