tree bda2a8dab0c66ef503c8be2a447ba63ca6fa1844
parent afe566044779063f93d31f2646e8c565773c5b91
parent 3f722f0d43d008c8a2a26035704bd520b1bd01dd
author Marco Miller <marco.miller@ericsson.com> 1547930377 -0500
committer Marco Miller <marco.miller@ericsson.com> 1547930387 -0500

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Add LICENSE(Apache V2) to go-import plugin
  Bazel: Include eclipse-out directory in .bazelignore
  Add explanatory comment to empty BUILD file(s)
  Update mockito to 2.23.4

Change-Id: I46ab0e91276c033158761556a8fb4880544d4140