OSDN Git Service

Merge "Hide CFI behind a global flag." am: 2d7fb30207
authorVishwath Mohan <vishwath@google.com>
Fri, 20 Jan 2017 01:50:44 +0000 (01:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 01:50:44 +0000 (01:50 +0000)
commit7baefbc0d405e3e9ca40f35bacf40d657680438c
tree06044d2b0fa27a7e41cca249de11ef3c97cdea7a
parent085a015abb8d372d42501ed83614d6edbd5421ba
parent3ca34aeb7eb63d663464703fdedf1bc040e21718
Merge "Hide CFI behind a global flag." am: 2d7fb30207
am: 3ca34aeb7e

Change-Id: Ibbc53641416c7493a68bed50e3aea13afd3e1f2f