tree d18242d290a4dfcd4ede3826be280425a21f5e16
parent 3c1504d9d7d529b8281a447dc69af3ecf6b5ec83
parent e51d75a9acef86008f4d64cf482bbc65e24dc66c
author Elliott Hughes <enh@google.com> 1364245418 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364245418 -0700

am e51d75a9: Merge "Clarify the dlmalloc USAGE_ERROR."

* commit 'e51d75a9acef86008f4d64cf482bbc65e24dc66c':
  Clarify the dlmalloc USAGE_ERROR.