tree 03a7aa272747b1c35bc448a966aa852e2a63f28b
parent f560a89470c83936f3187d96e4bbe8b21eecc8e3
parent 77e1e5c2a4d9b051a934dedf4b5928fd1fe1a116
author Tianjie Xu <xunchang@google.com> 1542229531 -0800
committer android-build-merger <android-build-merger@google.com> 1542229531 -0800

Merge "image generator: format the java file" am: 860c82a66b am: 5faf4021c9
am: 77e1e5c2a4

Change-Id: I2e7c7b133e35799620a57a24d93e75f8f956c3f5