tree f63f2f030eeca081eca67cd3b84830dbcd507496
parent d717f86a3ed9bf0878ce67c176755f656cec29c2
parent 1ec3ba4471d5883742b2500ba53ed2272539e756
author Evgenii Stepanov <eugenis@google.com> 1439774119 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439774119 +0000

am 1ec3ba44: am 428f626d: Merge "Read global ASAN_OPTIONS from a file."

* commit '1ec3ba4471d5883742b2500ba53ed2272539e756':
  Read global ASAN_OPTIONS from a file.