OSDN Git Service

Merge "Fix broken unit tests due to mockito upgrade." into oc-dev
authorMakoto Onuki <omakoto@google.com>
Fri, 31 Mar 2017 00:50:54 +0000 (00:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 31 Mar 2017 00:50:54 +0000 (00:50 +0000)
commitdb2eda2644fdb8328c4b71494199e741350d879b
tree3677eb3740fbe867aa6bb54d4e8d6eb4fc5d1c2f
parent2e9ab19544eccf9f01332a2f38b663b921d866a5
parent554c5946ce9fb273d4b95839fa1f04a680ff9034
Merge "Fix broken unit tests due to mockito upgrade." into oc-dev
am: 554c5946ce

Change-Id: I6750f350a2aa171308bf3694c3e8cec8c9b44fe2