tree 8f19d3218925ab108f8f05e934b8ab1b9053652c
parent 88da2bfaacaafebdd2e0fb9542386486b9594871
parent c8868db2a025a97e439f8a9adde565c9c83f2204
author Victoria Lease <violets@google.com> 1395266912 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1395266912 -0700

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

* commit 'c8868db2a025a97e439f8a9adde565c9c83f2204':
  malloc some advances