tree 7cae3fa9f61627c4aa495d298415c1c1515cd04c
parent 0acf4069e98339911d998e95fc946dfa4b336f8e
parent 0dfb2ecaab681e27fa81462daec9882ebcf36edc
author Elliott Hughes <enh@google.com> 1358897028 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358897028 -0800

am 0dfb2eca: am 0609c0fe: am 7af7895e: Merge "Use the new non-allocating logging for dlmalloc failures."

* commit '0dfb2ecaab681e27fa81462daec9882ebcf36edc':
  Use the new non-allocating logging for dlmalloc failures.