tree 62047eee3150f10b5af12cf5f1cc56fae895cde2
parent a1e70195a1c24da4e895f5b90115a4911731bbf7
parent 83665f3c2692b6f501a9a23dd608f8d96b516548
author David Pursehouse <dpursehouse@collab.net> 1542136427 -0800
committer David Pursehouse <dpursehouse@collab.net> 1542136576 -0800

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  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.15.7 API, and fix build
errors.

Change-Id: Ie47f129ab39f53f414cc3de6256cb016a0b47902