| commit | ac4eac89704b8cb3a79ff32a3d90e36a71cf0cec | [log] [tgz] |
|---|---|---|
| author | Paul Duffin <paulduffin@google.com> | Fri Mar 10 20:47:09 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 10 20:47:09 2017 +0000 |
| tree | 6a25bd0b4a894758d0def56efd203805f01a51ab | |
| parent | dff2c71b86b0ae6d890eeb87788bfeb64ebb2757 [diff] | |
| parent | 17e5a2d85150cd116cb1f502b09f5894003456cb [diff] |
Merge "Refactor code incompatible with Mockito 2.7.13" am: 2a3a4f81f9 am: 17e5a2d851 Change-Id: I91f5108861ed4eb47d9fae13860e79babf0f4bf9