OSDN Git Service

Merge "Hide CFI behind a global flag." am: c0bf85a615
authorVishwath Mohan <vishwath@google.com>
Fri, 20 Jan 2017 01:50:38 +0000 (01:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 01:50:38 +0000 (01:50 +0000)
commit085a015abb8d372d42501ed83614d6edbd5421ba
tree6ec91d0b7906b026a9ee4d9010be5cc51a10c4c9
parentb7303cde957ea7cd3c377ef6af64b7861e74bbb6
parent1bd8984ace6d258056cf02c34aea8533ff105273
Merge "Hide CFI behind a global flag." am: c0bf85a615
am: 1bd8984ace

Change-Id: I8e1898c9bc087f66a2e1ed5a45c37a2340f419ad