tree 06044d2b0fa27a7e41cca249de11ef3c97cdea7a
parent 085a015abb8d372d42501ed83614d6edbd5421ba
parent 3ca34aeb7eb63d663464703fdedf1bc040e21718
author Vishwath Mohan <vishwath@google.com> 1484877044 +0000
committer android-build-merger <android-build-merger@google.com> 1484877044 +0000

Merge "Hide CFI behind a global flag." am: 2d7fb30207
am: 3ca34aeb7e

Change-Id: Ibbc53641416c7493a68bed50e3aea13afd3e1f2f