tree f1b6d9128dfc079911f3d4492e00218d3c2a25af
parent 84ea200ef0afd161a87d68f132f9eca2330bd2d6
parent 41e0ceb5c9fcb8d671c1237e84f7c58182ab2a79
author Jiyong Park <jiyong@google.com> 1495849849 +0000
committer android-build-merger <android-build-merger@google.com> 1495849849 +0000

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

Change-Id: I6e9faedbb26d94aab7064c2c8620362c776143be