tree a1a984e8c94750699cbb0931b59a6d5890a947f8
parent 23525a30dfcbd5e3b00b5b2be42555c84cbf82dd
parent 4fd2725556be1a0c007ecdb57681474dbf3045ec
author Chris Banes <chrisbanes@google.com> 1550084177 -0800
committer android-build-merger <android-build-merger@google.com> 1550084177 -0800

Merge "Ignore Gradle temp files in jdiff" am: 0be98884b3 am: b0dfb93378
am: 4fd2725556

Change-Id: Ied21c54220a093eac2137ee93a56b166a54e987d