tree cd2a4edbd9d9458b1302bc18592f7b3891dda67d
parent c3b71f2a28c7e679ac65d26da98b1ba58499f6ad
parent 4167aa25d6eb08ee32c6b61312b3b171f99d563a
author Tao Bao <tbao@google.com> 1506474547 +0000
committer android-build-merger <android-build-merger@google.com> 1506474547 +0000

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

Change-Id: If7c8e32c321fe0d20e063a0e4d93cb1b09226cef