tree 6fe6073ea716b9c2edafe3bbc7dd20b9ab40b1dd
parent 10caca13da7c6acde00411dfb4ab128c75b24e86
parent 3af2a37e057b31617b8f4eeb22ac3ef85c3fd5aa
author Victoria Lease <violets@google.com> 1395101626 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1395101626 +0000

Merge "malloc some advances"