tree 3d0a2ed4b95b0441b48a4e2a920746b128c8798f
parent 67a92975ac638db3d51ea4978cf78ee207fcceb7
parent 754bf6abc0f5a5a26eda4081ce01b1f013a0e1e2
author Victoria Lease <violets@google.com> 1395267247 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1395267247 -0700

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

* commit '754bf6abc0f5a5a26eda4081ce01b1f013a0e1e2':
  malloc some advances