tree 44bf8958b6482a4a975144c072e4b206bf81995c
parent 0f987bad826c9ddf4caccf8fbe0a2eb81e0e881d
parent 22b6abc96d855dbc07772b7dee326a5eb0058955
author Vishwath Mohan <vishwath@google.com> 1509414656 +0000
committer android-build-merger <android-build-merger@google.com> 1509414656 +0000

Merge "CFI compatibility with static executables and nested archives"
am: 22b6abc96d

Change-Id: Ie72297f286af9ecf0ffeea9d093351c2c7a82fa0