tree 8375d8cccff043db83e97c2ddd1647ee545ea70b
parent 2466c229d0402a524d06cce24633173543c997d6
parent 39dae890b97eb9ab905cfdb27801d883cf5a72a4
author David Pursehouse <dpursehouse@collab.net> 1542136616 -0800
committer David Pursehouse <dpursehouse@collab.net> 1542136675 -0800

Merge branch 'stable-2.15'

* stable-2.15:
  Add Eclipse generated files to .gitignore
  AutomaticMerger: Format with google-java-format
  AtomicityHelper: Remove usage of deprecated SubmitInput.waitForMerge
  Stop using deprecated Files.toString
  Add missing test deps for Eclipse project
  Set executable flag on tools/eclipse/project.sh
  Add standalone build with 2.14.17 API
  Fix partial merge of cross-repo

Also update WORKSPACE to build with 2.16-rc3 API.

Change-Id: I2b965d677539da7dc9a7c5bdeda37baa35366e7e