tree ab2d6df63071ac9af42b2d3c0785e0b3fd2448c4
parent fb70c580b1497a31ff345b36f032241fa55415b2
parent 4f0cb0307b93b407abe110f3d17085d7807c137c
author Ying Wang <wangying@android.com> 1449543678 +0000
committer android-build-merger <android-build-merger@google.com> 1449543678 +0000

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

* commit '4f0cb0307b93b407abe110f3d17085d7807c137c':
  Fix TARGET_ASAN build.