tree 5104e50fd50e62f0a1107e4ff8b0e2275a472cb1
parent 9a49d8ef47c1e99740262b537b212723b5f964d7
parent d949357589509ebb21e228b1aa1b40917247e1c9
author Vishwath Mohan <vishwath@google.com> 1511310036 +0000
committer android-build-merger <android-build-merger@google.com> 1511310036 +0000

Merge "Use the .cfi variant of a static library where needed." am: 061fcfc254 am: 9cdabdad04
am: d949357589

Change-Id: I149ac15dd6e31799e566bbcf9a45a967ad716f68