tree d0e46179ac2022b454929b548337da46843b15c0
parent f2cbe5bfefb619c94601464eeb2f4149612b737f
parent ca50d9b6dcdc18315cc3a87be96337ec8cfa6cbd
author tavila <tavila@google.com> 1575587450 -0800
committer android-build-merger <android-build-merger@google.com> 1575587450 -0800

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