tree e94cc281162c62d1cd241b9b3cbbe9d70c1cc7c4
parent 384bdb3776bedaf22e8f1a3dfe7c6118b4bcefa4
parent a4f88fdcf0e9be084d04048ad65671716298c3c2
author Elliott Hughes <enh@google.com> 1360015155 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360015155 -0800

am a4f88fdc: Merge "Document the mallinfo struct, add missing attributes."

# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'a4f88fdcf0e9be084d04048ad65671716298c3c2':
  Document the mallinfo struct, add missing attributes.