tree abd5c5eb8cec531b4675b2c4d31f33c2507b316a
parent 963a3e15f6ccea91a5ebffd0babe1a10b8cd65c1
parent 195842474a6722fdf2d967446b81d8accbd4648c
author Evgenii Stepanov <eugenis@google.com> 1442608906 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442608906 +0000

am 19584247: am ee08fb53: Merge "asan: update condition to work with multiple SANITIZE_TARGET values."

* commit '195842474a6722fdf2d967446b81d8accbd4648c':
  asan: update condition to work with multiple SANITIZE_TARGET values.