commit | d807b41da6f1754473178cf45d7291c5009a037c | [log] [tgz] |
---|---|---|
author | Haibo Huang <hhb@google.com> | Mon Mar 08 14:57:21 2021 -0800 |
committer | Haibo Huang <hhb@google.com> | Mon Mar 08 23:05:27 2021 +0000 |
tree | 5fab2f07028c3ac745620700a917eef3c864a770 | |
parent | b4c2935bb2fb235489fec4c5799163932160aac5 [diff] | |
parent | c941d7a65937a1bda3a84e9a4748bb50ca86fabe [diff] |
resolve merge conflicts of c941d7a65937a1bda3a84e9a4748bb50ca86fabe to sc-dev Test: I solemnly swear I tested this conflict resolution. Bug: 170642246 Change-Id: I7c8d1b9aec355d71dd80a828572883404c72c5cb
Native (C++) code format is required to be compatible with .clang-format file. Run
git clang-format --style=file --extension='h,cpp,cc' HEAD~
Note that clang-format is not desirable for Android java files. Therefore the command line above is limited to specific extensions.