| commit | cf5a2e36745ecbadbd5ca5193e04acb967ff5be8 | [log] [tgz] |
|---|---|---|
| author | Philip P. Moltmann <moltmann@google.com> | Fri Sep 07 09:48:30 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 07 09:48:30 2018 -0700 |
| tree | 228156e296565d168a4777f263205c9b8181a23d | |
| parent | 709b9ee4e65fcb19a257f60ed54315931f761b09 [diff] | |
| parent | 2b0ee6cae346936c3e6ecdb42abaff60d5a10833 [diff] |
Merge "Fix usage of internal mockito API" am: 5666119e79 am: 2b0ee6cae3 Change-Id: I15a8c518edff8ef188f02ef5207bae7d85a2223e