tree ea151c2d743a834d0eab48f723c90b4396913398
parent edf7a4eb95824ea1656daafe3d9ecbabb093586e
parent 9a86cd8b883380b7e74f6c660aef543d03360a0c
author Paul Crowley <paulcrowley@google.com> 1537511128 -0700
committer android-build-merger <android-build-merger@google.com> 1537511128 -0700

[automerger skipped] Merge "clang-format the rest of the files" am: 1934619b8b am: 50cd072d3b
am: 9a86cd8b88  -s ours

Change-Id: I1f20de3736fcfbabae70aa416673b99d1fb0eb65