tree 0dbbc929f4cd2cba1ef98ded341474bd25c99bea
parent c7d2f69ba87b1f715eae2d4a7b74e5b791e8bb6c
parent 88fd6aff388cf50a6c596d31b2eba6f5bf596648
author Tao Bao <tbao@google.com> 1506474392 +0000
committer android-build-merger <android-build-merger@google.com> 1506474392 +0000

Merge "clang-format: Remove the override of PenaltyExcessCharacter." am: 151f0820ac am: fccf3bc0cf
am: 88fd6aff38

Change-Id: I268dbd09e13dce5920b5025a5cbf73b06b493668