commit b7eee25ab8e0f1c149bdacbe1f686650c559dd6e
author Tom Cherry <tomcherry@google.com> Tue Mar 14 01:15:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 14 01:15:23 2017 +0000
tree 42195100812b53b2e6b6eb766f3e1d20032951d0
parent 00e21585d24db782e50de85032a2ec0936d4aeea
parent 44919e060d34a744c682c53317bffed7a7e2d7f8

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

Change-Id: I3a7b779206c7977662325b340b230d7e08bbf7c4

init/.clang-format

diff --git a/init/.clang-format b/init/.clang-format
deleted file mode 100644
index 48d423f..0000000
--- a/init/.clang-format
+++ /dev/null
@@ -1,14 +0,0 @@
----
-Language:        Cpp
-BasedOnStyle:  Google
-BinPackArguments: true
-BinPackParameters: true
-ColumnLimit:     100
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-IndentWidth:     4
-Standard:        Auto
-TabWidth:        8
-UseTab:          Never
-DerivePointerAlignment: false
-PointerAlignment: Left
-...

init/.clang-format

diff --git a/init/.clang-format b/init/.clang-format
new file mode 120000
index 0000000..1af4f51
--- /dev/null
+++ b/init/.clang-format
@@ -0,0 +1 @@
+../.clang-format-4
\ No newline at end of file