am 873ce6b5: Merge "Add clang-format file to approximate existing style"
am 873ce6b5: Merge "Add clang-format file to approximate existing style"

* commit '873ce6b5b4058c01f0b4538b4946734a98d8aaba':
  Add clang-format file to approximate existing style

google/conscrypt,google/conscrypt,google/conscrypt,google/conscrypt,google/conscrypt,google/conscrypt