tree 1f998255fd2ee6f7c54afb4f1194eed27c1c9041
parent 448af2aa77bb5d3349b75aa730347d64618df9cb
parent fccf3bc0cf130e60e2e70b8b648b23ee712b4152
author Tao Bao <tbao@google.com> 1506474232 +0000
committer android-build-merger <android-build-merger@google.com> 1506474232 +0000

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

Change-Id: Ia081fa95df4fb5eebf17d984cd012f6bbde12e40