am 8c6b0d16: (-s ours) am a80ae8b8: Merge "Add a .clang-format file."

* commit '8c6b0d164e0d7a1a3ae4a2497e3bb9d5ae208a02':
This commit is contained in:
Dan Albert 2015-08-27 05:06:14 +00:00 committed by Android Git Automerger
commit 4ca3de4502

Diff Content Not Available