Maxime Guerreiro 3f1da3b39e Merge branch stable-2.15 ...

* stable-2.15:
  Check Merger#merge's returned boolean when merging

Change-Id: I9e72bd9a2f07fda699b59092f090fde5345bf8cd

2018-06-25 12:25:49 +00:00

..

com/google

Merge branch stable-2.15

2018-06-25 12:25:49 +00:00

gerrit

Reformat all Java files with google-java-format 1.6

2018-06-06 10:26:51 +09:00

org

Migrate all remaining classes to Flogger

2018-06-05 13:14:12 +02:00

BUILD

…

Main.java

…