commit 7f6df039a033f48c702d3273c54f9b384117a3a5
author Steven Moreland <smoreland@google.com> Wed May 03 21:59:37 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 03 21:59:37 2017 +0000
tree 0e168dc7cd6bf607862969e722eaeb29dd151e3a
parent 5fba1db1d28839f0cf7014f838fee30a10da3f0c
parent 1cc710873657c0ea58fced13c585506dbdeb7081

.clang-format: 100 lines am: 5242af6d24
am: 1cc7108736

Change-Id: If99a71d1df69f553b7634fea600f4cc5c137e401

.clang-format

diff --git a/.clang-format b/.clang-format
index 787d47a..9b3f9d9 100644
--- a/.clang-format
+++ b/.clang-format
@@ -14,15 +14,11 @@
 # limitations under the License.
 #
 
-#
-# Below are some minor deviations from the default Google style to
-# accommodate for handling of the large legacy code base.
-#
-
 BasedOnStyle: Google
 CommentPragmas: NOLINT:.*
 DerivePointerAlignment: false
 AllowShortFunctionsOnASingleLine: Inline
+ColumnLimit: 100
 TabWidth: 4
 UseTab: Never
 IndentWidth: 4