tree 80b979af67384dca48c8e3efc721db5cbf8385aa
parent e61835652e397c41d21ffa72593dec2308ed45e5
parent 08d3f97e7f969d4c562340ba4c3ab7f5c8e9b3ab
author Jiyong Park <jiyong@google.com> 1495850067 +0000
committer android-build-merger <android-build-merger@google.com> 1495850067 +0000

Merge "linker: disable ld.config.txt in ASAN mode" into oc-dev am: 41e0ceb5c9
am: 08d3f97e7f

Change-Id: I32c0e73d2080ae1f65e5855bce6ecca467f20e42