tree 61dc73af48d3e9a6f0d4b8c44d0e1e118614e6d7
parent f9b1b4c37de54e7edf1310b4b2fc0a55d7e3facf
parent 8350c4c540b6ad8a5e5ea01b6aacb9e92fa3d7dc
author Colin Cross <ccross@android.com> 1509483701 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1509483701 +0000

Merge "Revert "CFI compatibility with static executables and nested archives""