| commit | db2eda2644fdb8328c4b71494199e741350d879b | [log] [tgz] |
|---|---|---|
| author | Makoto Onuki <omakoto@google.com> | Fri Mar 31 00:50:54 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 31 00:50:54 2017 +0000 |
| tree | 3677eb3740fbe867aa6bb54d4e8d6eb4fc5d1c2f | |
| parent | 2e9ab19544eccf9f01332a2f38b663b921d866a5 [diff] | |
| parent | 554c5946ce9fb273d4b95839fa1f04a680ff9034 [diff] |
Merge "Fix broken unit tests due to mockito upgrade." into oc-dev am: 554c5946ce Change-Id: I6750f350a2aa171308bf3694c3e8cec8c9b44fe2