tree 42195100812b53b2e6b6eb766f3e1d20032951d0
parent 00e21585d24db782e50de85032a2ec0936d4aeea
parent 44919e060d34a744c682c53317bffed7a7e2d7f8
author Tom Cherry <tomcherry@google.com> 1489454123 +0000
committer android-build-merger <android-build-merger@google.com> 1489454123 +0000

Merge "init: Remove custom clang-format" am: e6b05dc683 am: f2ee4c8e4b
am: 44919e060d

Change-Id: I3a7b779206c7977662325b340b230d7e08bbf7c4