From: Ying Wang <wangying@android.com>
Date: Tue, 8 Dec 2015 03:01:18 +0000 (+0000)
Subject: Merge "Fix TARGET_ASAN build." am: 9bbc67b55a
X-Git-Tag: android-x86-7.1-r1~492^2~129
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8d5ff73ce4a3a48a414f25289ba5220f3e91f0cd;p=android-x86%2Fbuild.git

Merge "Fix TARGET_ASAN build." am: 9bbc67b55a
am: 4f0cb0307b

* commit '4f0cb0307b93b407abe110f3d17085d7807c137c':
  Fix TARGET_ASAN build.
---

8d5ff73ce4a3a48a414f25289ba5220f3e91f0cd