tree 246e7f232aa7430990cbec98bd2c69d53b9d1937
parent 2117840fbb2e4f45b6a96722d150957865f8d120
parent 42a12f7b25e2407a0992cadba49ec1cc1fded885
author Tom Cherry <tomcherry@google.com> 1489539335 +0000
committer android-build-merger <android-build-merger@google.com> 1489539335 +0000

Merge "Remove extraneous .clang-format files"
am: 42a12f7b25

Change-Id: I5062d81a01cde71a9bbe7549f9e3c9198af955ae