Index: cfe/trunk/tools/clang-format/git-clang-format
===================================================================
--- cfe/trunk/tools/clang-format/git-clang-format
+++ cfe/trunk/tools/clang-format/git-clang-format
@@ -77,6 +77,7 @@
       'cc', 'cp', 'cpp', 'c++', 'cxx', 'hpp',  # C++
       # Other languages that clang-format supports
       'proto', 'protodevel',  # Protocol Buffers
+      'java',  # Java
       'js',  # JavaScript
       'ts',  # TypeScript
       ])