tree 71f60c4680c6764b6adce56579f4d3ce1dbb6506
parent 08c4130493651bc5c7877804276fe6dd6b050f60
parent b76960c9845ba0e2f4dbfabe9dc747e752b8049e
author Tao Bao <tbao@google.com> 1479148112 +0000
committer android-build-merger <android-build-merger@google.com> 1479148112 +0000

Merge "Add .clang-format style file."
am: b76960c984

Change-Id: I38d670b4d2fb799e12e70f10d6cd7a0e3914369e