OSDN Git Service

Merge "Hide CFI behind a global flag." am: c0bf85a615 am: 1bd8984ace
authorVishwath Mohan <vishwath@google.com>
Fri, 20 Jan 2017 01:56:08 +0000 (01:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 01:56:08 +0000 (01:56 +0000)
am: 085a015abb

Change-Id: I4b5deed6eb0b3f3ad0cde1ea78f299f0e34db0c6


Trivial merge