tree 782cfe53ebf93af3e8cda4d9abe1955b4fbf4f24
parent f8c8f7cf281db72b81c1cb3f36e1f44167581c6c
parent 375559cbf17f63d9d5b911e1056e9ae8810dce57
author Marco Miller <marco.miller@ericsson.com> 1589389657 -0400
committer Marco Miller <marco.miller@ericsson.com> 1589389657 -0400

Merge branch 'stable-3.1'

* stable-3.1:
  Format Java files with google-java-format
  Add missing newline at end of tools/BUILD
  Format Java files with google-java-format
  Update external dependencies
  Revert "Remove Tika dependency for uploadvalidator"
  Add test for mime type detection

Change-Id: I8dba5f634b4326d0c429d30632f1d0610d9b8ab4