OSDN Git Service

Merge "Hide CFI behind a global flag." am: 2d7fb30207 am: 3ca34aeb7e
authorVishwath Mohan <vishwath@google.com>
Fri, 20 Jan 2017 01:56:14 +0000 (01:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 01:56:14 +0000 (01:56 +0000)
commitd458faeeacf84ec57e18da5daad1259caf0f5109
tree335144d584d439be8bd4042162ae0d60bdd65a83
parent5b30c115a43984aea7f74495479a0bb17e74cea7
parent7baefbc0d405e3e9ca40f35bacf40d657680438c
Merge "Hide CFI behind a global flag." am: 2d7fb30207 am: 3ca34aeb7e
am: 7baefbc0d4

Change-Id: I4c3ec234d252abc64c1f35afc87c03fbaaeea7d2