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

Merge "Rename CFI blocklist file." am: e6b2b9154e am: b42924c359

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

Change-Id: Ic482adf7a2e96a311cdc28a3bb920b9e3ff41ec6