tree 0a4d54436ba7b048206d06d7dd69c4251d1bc636
parent 0f819849701c0154f7207b6a8a31e06ebbbc2ff6
parent 1f0af0c2ea952a37fc4052cddf6f1dec85f87723
author Tao Bao <tbao@google.com> 1479148569 +0000
committer android-build-merger <android-build-merger@google.com> 1479148569 +0000

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

Change-Id: I836abea8c0319cfe0b45c29fb6856195fe4b0f1e