Update from https://crrev.com/302630

.clang-format

Index: .clang-format
diff --git a/.clang-format b/.clang-format
index 0f21d0bb9e4a31e91f24f624dec27a85be72a64c..a5431379051094c2a45597a600108f4be2c87036 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,4 +1,19 @@
 # Defines the Chromium style for automatic reformatting.
 # http://clang.llvm.org/docs/ClangFormatStyleOptions.html
 BasedOnStyle: Chromium
+# This defaults to 'Auto'. Explicitly set it for a while, so that
+# 'vector<vector<int> >' in existing files gets formatted to
+# 'vector<vector<int>>'. ('Auto' means that clang-format will only use
+# 'int>>' if the file already contains at least one such instance.)
 Standard: Cpp11
+
+---
+Language: Java
+# See http://crbug.com/429372 for information about this section.
+IndentWidth: 4
+ContinuationIndentWidth: 8
+ColumnLimit: 100
+AllowShortBlocksOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: true
+Cpp11BracedListStyle: false  # but see http://llvm.org/PR21457