| commit | 8bf406acc077d5f27bd9b1d4d9525ca70db5cb0f | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Aug 10 16:18:18 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 10 16:18:18 2016 +0000 |
| tree | 3fcdbe980532c6abdbb7097820fbe73a2f9d6ef6 | |
| parent | c9ba18ba8eb8181cc251691ebf16d9396b72010e [diff] | |
| parent | d81d51ac046e2378bfe947aef46497b69e32f890 [diff] |
Merge "Add Mockito to deps for Conscrypt tests and remove core-tests" am: d81d51ac04 Change-Id: I6e033f57aea2d5aaa703db674e0b3561ab0f351c