tree 46e6788843f7cec932e631ff6f818534fd84c71d
parent 463624ed530090251245f7be43b4e2716b0e2944
parent e0a04446d81748385fc75beb82add6db56ffd757
author Jeff Davidson <jpd@google.com> 1482432930 +0000
committer android-build-merger <android-build-merger@google.com> 1482432930 +0000

Merge "Update google-java-format to 1.2-SNAPSHOT."
am: e0a04446d8

Change-Id: Ia99feeeb08fad2375ebcda6b585e344157da93b1