OSDN Git Service

Merge "Hide CFI behind a global flag." am: 2d7fb30207 am: 3ca34aeb7e am: 7baefbc0d4
authorVishwath Mohan <vishwath@google.com>
Fri, 20 Jan 2017 02:06:16 +0000 (02:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 02:06:16 +0000 (02:06 +0000)
am: d458faeeac

Change-Id: I297ab011fb901d6069672d034e2d8b8483ca21cb


Trivial merge