commit | a8597ca323625359468919c7ccbbc58b85bc78a2 | [log] [tgz] |
---|---|---|
author | android-build-team Robot <android-build-team-robot@google.com> | Thu Mar 19 04:53:21 2020 +0000 |
committer | android-build-team Robot <android-build-team-robot@google.com> | Thu Mar 19 04:53:21 2020 +0000 |
tree | 67fc2b2ba021264d5af6e6cb486bcb209175611d | |
parent | e410a5b973593cde62953666acb432ddf2d77102 [diff] | |
parent | ccec16a3392eb5599a7e3fcd8664137105f71ca9 [diff] |
Merge cherrypicks of [10745155, 10743283, 10746098, 10735615, 10743284, 10745369, 10745156, 10745157, 10746136, 10746137, 10745215, 10746138, 10745216, 10745217, 10746139, 10745218, 10743285, 10746118, 10746119, 10745827, 10745158, 10745159, 10743224, 10743225, 10745492] into qt-qpr2-release Change-Id: I1cbb2a98fc5a60929b454b4595e95ca9856cfc87
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.