| commit | 33756a72b3ac44ac5b0fe8c4027e9ee4106f4e6d | [log] [tgz] |
|---|---|---|
| author | Yabin Huang <yabinh@google.com> | Mon Nov 11 17:43:40 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 11 17:43:40 2019 -0800 |
| tree | bddae712d611d7da1bbc80315b15f01a801e9f48 | |
| parent | d911598a0db40e08101ff7f37ec6830b2bd9ad6d [diff] | |
| parent | 6840b1e5614fad7311dc6da9061c903f9485c757 [diff] |
resolve merge conflicts of 9ce2da427fc42c0c358b8555c7163f2821d9c14b to qt-qpr1-dev am: 6840b1e561 Change-Id: Ica6c4ada84c2d4c39b0dccaacf41abb52fb28570
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.