tree fa526cd07e707d1a7a3271635428a912be2c153e
parent d40afc479e3f15901254b66266f1514a9d78c81d
parent c4a9f458ac5aa1211c60a869764db7e4b2994370
author Shawn Pearce <sop@google.com> 1426827786 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1426827787 +0000

Merge changes Icaf1ef7f,I979c222a,I9e05ee0b,I798a4707,I7732f3ec

* changes:
  Add options to PrologMain to emulate usage in Gerrit
  Cleanup formatting of PrologMain
  Correct usage for cafeteria java_binary()
  Remove version from PrologMain header
  Add missing fake_pom_deploy.xml required by buck build deploy