OSDN Git Service

Merge "Fix TARGET_ASAN build." am: 9bbc67b55a
authorYing Wang <wangying@android.com>
Tue, 8 Dec 2015 03:01:18 +0000 (03:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 8 Dec 2015 03:01:18 +0000 (03:01 +0000)
am: 4f0cb0307b

* commit '4f0cb0307b93b407abe110f3d17085d7807c137c':
  Fix TARGET_ASAN build.

1  2 
core/Makefile

diff --cc core/Makefile
Simple merge