commit | 5974d730f5d0206681cc3a60ba21dd42d8ba3331 | [log] [tgz] |
---|---|---|
author | Mathieu Chartier <mathieuc@google.com> | Sat Aug 30 01:49:42 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 30 01:49:42 2014 +0000 |
tree | 950f24e12688d59cafec2a4cd5a7fed28649371d | |
parent | 2414f120cbdcd66c9ebd7a35b0d3bd0f16840429 [diff] | |
parent | 20632daac36995947d2d1943f89f07ac277e61f0 [diff] |
am 20632daa: Merge "Add native memory accounting through custom allocator." into lmp-dev * commit '20632daac36995947d2d1943f89f07ac277e61f0': Add native memory accounting through custom allocator.