commit e432256094ee3ae0ce336efd68e02266d6391e63
author tavila <tavila@google.com> Thu Dec 05 15:10:50 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Dec 05 15:10:50 2019 -0800
tree d0e46179ac2022b454929b548337da46843b15c0
parent f2cbe5bfefb619c94601464eeb2f4149612b737f
parent ca50d9b6dcdc18315cc3a87be96337ec8cfa6cbd

Merge "Exempt-From-Owner-Approval: rename .clang-format4 to .clang-format-4 to be consistent with stage-aosp-master" into qt-qpr1-dev-plus-aosp
am: ca50d9b6dc

Change-Id: If4c182d15992e232d7e70d207b2d2a0e0211159e

.clang-format

diff --git a/.clang-format b/.clang-format
index e2b1182..9b45e0a 120000
--- a/.clang-format
+++ b/.clang-format
@@ -1 +1 @@
-.clang-format4
\ No newline at end of file
+.clang-format-4
\ No newline at end of file

.clang-format-4

diff --git a/.clang-format4 b/.clang-format-4
similarity index 100%
rename from .clang-format4
rename to .clang-format-4