tree c66c4c271fc83583c6dcb346ac408fc6ade8453c
parent ed529a5a78ade4833a8fd2ddfaf88d68ca260e6b
parent 737d3e5da366124d164555009fa5ee4552143cc8
author Victoria Lease <violets@google.com> 1395266608 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1395266608 -0700

am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances

* commit '737d3e5da366124d164555009fa5ee4552143cc8':
  malloc some advances