0b89130615ccf1a4c3f362ea815d781e747f3b1e - plugins/gc-conductor

commit: 0b89130615ccf1a4c3f362ea815d781e747f3b1e
[log]
author: David Pursehouse <dpursehouse@collab.net>
Wed Feb 20 13:16:16 2019 +0900
committer: David Pursehouse <dpursehouse@collab.net>
Wed Feb 20 13:16:16 2019 +0900
tree: a8dfda9de85e6630441880653ec3d2739bc7345e
parent: c9f3200b97124514c50a2f6eb045e1512a01e8dd [diff]
parent: 1b66f13062605c3f9a3a2e743986c3b3555ecbcb [diff]

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.24.5

Change-Id: I194e56fc52d90542f3ac4e646a9e8b06040246b4

tree: a8dfda9de85e6630441880653ec3d2739bc7345e