tree 40c33b897e5e6d4a8ef770c32b3c84d658ad9dee
parent 7a37c938256400d5ccc3fd179cc037d5b9f10196
parent 8b2b67bc1e547091cfab973ff8eff27d6e980473
author Paul Crowley <paulcrowley@google.com> 1537404223 -0700
committer android-build-merger <android-build-merger@google.com> 1537404223 -0700

Merge "clang-format many files." am: a676df01e2 am: 957b9544dd
am: 8b2b67bc1e

Change-Id: Iad04e9517cd01e2ea13281b31e7b13ae75414d7e