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

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

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

Change-Id: I93747e6a05c361bb62a07229a5328a33b1be8114