tree 9b3f710c60831da105a16f3283db4da79779f5b9
parent 369f92349fc784f6c14ad30f5806f708a8f2c7f7
parent a850ad4cf44e998e24f43df723b6928e42f8294d
author Elliott Hughes <enh@google.com> 1364245554 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364245554 -0700

am a850ad4c: am e51d75a9: Merge "Clarify the dlmalloc USAGE_ERROR."

* commit 'a850ad4cf44e998e24f43df723b6928e42f8294d':
  Clarify the dlmalloc USAGE_ERROR.