tree 811719b15500994b76fcd55d9b636960f6afe305
parent 660e058739196237c4f4b2680cb59d1bed52a061
parent 721e6a455f2100138009dee0d8592ecbc4bedbac
author Dan Albert <danalbert@google.com> 1434491134 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434491134 +0000

am 721e6a45: Merge "Use new sanitizer option."

* commit '721e6a455f2100138009dee0d8592ecbc4bedbac':
  Use new sanitizer option.