tree d0e46179ac2022b454929b548337da46843b15c0
parent 8db320d3a3322955531066014d338883141c2328
parent 6ce34b8ffeb9fa9f66702c5e10bf84860497f129
author tavila <tavila@google.com> 1575586364 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1575586364 +0000

Merge "Exempt-From-Owner-Approval: rename .clang-format4 to .clang-format-4 to be consistent with stage-aosp-master" into qt-qpr1-dev-plus-aosp