commit ee22177d82cfaa659fbcd54791c632eee9f39f1c
author Tom Cherry <tomcherry@google.com> Tue Mar 14 01:05:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 14 01:05:24 2017 +0000
tree a3d3b99067254bcfb5a94060b21e1dcb0820b1a7
parent 988f6f8c6a85aa6c12b8eebbfc045a536a7d7aed
parent a0cdc21ec3028259fe74402e1e8825d32909f867

Merge "init: Remove custom clang-format"
am: e6b05dc683

Change-Id: I167ead68a8cf23083f3fa240f70fcfe6690a5b9a

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