tree b5abff84c34d04e6077d322d344ce7935b0536f4
parent 67a120112e6de3b5a14768e96884c58ad35b1405
parent 9039c1a1dafbd5508aac8cb5af4268577a4bddd1
author Dan Albert <danalbert@google.com> 1414034249 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414034249 +0000

am 9039c1a1: Merge "Never build libpng.a with ASAN."

* commit '9039c1a1dafbd5508aac8cb5af4268577a4bddd1':
  Never build libpng.a with ASAN.