tree fc726849d8aac913e847620973497d8b2a72b47c
parent 4a1db8a2a1eaf8800a1e749b3a5089cd9e193253
parent 8d5ff73ce4a3a48a414f25289ba5220f3e91f0cd
author Ying Wang <wangying@android.com> 1449543883 +0000
committer android-build-merger <android-build-merger@google.com> 1449543883 +0000

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

* commit '8d5ff73ce4a3a48a414f25289ba5220f3e91f0cd':
  Fix TARGET_ASAN build.