commit 29c1fce1bb25964ca277fc0dd5c1be2cc7442642
author Josh Gao <jmgao@google.com> Wed Nov 11 22:31:42 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 11 22:31:42 2015 +0000
tree e2455fc2d1121e8ebaba3dd0799701b5f8d1eca2
parent cbdbc156b75ce74383cf7a4bbad2515ae78f47e6
parent 95a533de30446aa8137b5b1876af81594cabbcfb

Merge "adb: add 100 column limit to .clang-format." am: 389cab802a am: ddb8244bc8
am: bc74fa9bed

* commit 'bc74fa9bedc4029594221b0b10f345f21d02d6ac':
  adb: add 100 column limit to .clang-format.

adb/.clang-format

diff --git a/adb/.clang-format b/adb/.clang-format
index 0395c8e..6737535 100644
--- a/adb/.clang-format
+++ b/adb/.clang-format
@@ -2,6 +2,7 @@
 AllowShortBlocksOnASingleLine: false
 AllowShortFunctionsOnASingleLine: false
 
+ColumnLimit: 100
 CommentPragmas: NOLINT:.*
 DerivePointerAlignment: false
 IndentWidth: 4