am df4492f3: (-s ours) am fad8370c: Merge "Improve .clang-format."

* commit 'df4492f339662ae1468bce3ee33270142227146c':
This commit is contained in:
Josh Gao 2015-08-27 05:06:16 +00:00 committed by Android Git Automerger
commit b8c276b778

Diff Content Not Available