[automerger skipped] Merge "clang-format the rest of the files" am: 1934619b8b
am: 50cd072d3b
am: 9a86cd8b88
-s ours
Change-Id: I1f20de3736fcfbabae70aa416673b99d1fb0eb65
gugelfrei
commit
bece484748