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
am: ca50d9b6dc

Change-Id: If4c182d15992e232d7e70d207b2d2a0e0211159e