tree 89730d1635d8c8be50c8e203dcb8650b51d368ee
parent 83c5095a0c8a7a90930e2ba427fdb64115402e21
parent e6b2b9154eb8d379dded20d1f9a746b4e993aff6
author Treehugger Robot <treehugger-gerrit@google.com> 1595952507 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595952507 +0000

Merge "Rename CFI blocklist file." am: e6b2b9154e

Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1373396

Change-Id: I9f1369c55b89117adacc70947e0530cfc54848d4