am 62571611: am 780d7d9f: Merge "Fix clang-format file for correct indent settings."

* commit '62571611ae10e426d28fe590106fccf6b39e086f':
  Fix clang-format file for correct indent settings.