tree 02d57557c2110bb3229f03910e3a78bef59a33e3
parent 2f1488ae86ad53d00544291c6312511ae3185fe7
parent 6e790c6a49d8a505c79f26debdfeddd41e886155
author Vishwath Mohan <vishwath@google.com> 1492652815 +0000
committer android-build-merger <android-build-merger@google.com> 1492652815 +0000

Merge "Change the global CFI flag to default to enabled." am: 45fd769588
am: 6e790c6a49

Change-Id: I45ee0c70c776576604fdf554a932574d1893bea9