commit | 0d54c813ff207a5514ac82fa993e66e471300fad | [log] [tgz] |
---|---|---|
author | Stephen Hines <srhines@google.com> | Tue Aug 27 15:52:23 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 27 15:52:23 2013 -0700 |
tree | 7a6103db3da44dfbd551abbd588bcc88dfde4894 | |
parent | 9d57998842a659740b4f9f203a9e3a0709b0485d [diff] | |
parent | bcedf3f0480bf606f578f22732e1e3111dad3532 [diff] |
am bcedf3f0: (-s ours) am 647a0e7a: (-s ours) Merge "DO NOT MERGE - Implement MemChunk::registerAllocFreeCallbacks()." * commit 'bcedf3f0480bf606f578f22732e1e3111dad3532': DO NOT MERGE - Implement MemChunk::registerAllocFreeCallbacks().