tree af92e41addd68f518e64deef2a5f670ec907bbc5
parent d4f2b219e366eb8b06422edb50ddc90422fd3adc
parent bb3adc0d7b76dbbfdb77d343638d3fd17dd1fac4
author David Pursehouse <dpursehouse@collab.net> 1498010233 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1498010233 +0000

Merge changes I3b55501b,Iea7d1265

* changes:
  AtomicityHelper: Remove usage of deprecated SubmitInput.waitForMerge
  Adapt to upstream changes in Submit.apply(...)