tree 0a4d54436ba7b048206d06d7dd69c4251d1bc636
parent c6bed0ab3f9bb1b2858ae5731e299974843f8e49
parent db50f8863a1b5eb1dacd5d213d22d32426057106
author Tao Bao <tbao@google.com> 1479148986 +0000
committer android-build-merger <android-build-merger@google.com> 1479148986 +0000

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

Change-Id: Ie27fd48f1a0b815e902e689bb79a4d65fab08bf6