tree 7a36aa6c762c4fe9e71eb8e7d11644a76d19db56
parent c4b74cc33868d5fca1ce4fe6bcdfb916c567d4bd
parent 58d44a2a6c09bac289e09cfcc962fe6944ef1860
author David Pursehouse <dpursehouse@collab.net> 1557823391 +0200
committer David Pursehouse <dpursehouse@collab.net> 1557823419 +0200

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Adapt Eclipse project generation for Bazel 0.25

Change-Id: I032384cac9023c0f8b6d18c5e8130897225dacf6