OSDN Git Service

Merge "Add native memory accounting through custom allocator." into lmp-dev
authorMathieu Chartier <mathieuc@google.com>
Sat, 30 Aug 2014 01:17:19 +0000 (01:17 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 30 Aug 2014 01:17:19 +0000 (01:17 +0000)
commit20632daac36995947d2d1943f89f07ac277e61f0
tree950f24e12688d59cafec2a4cd5a7fed28649371d
parent9bf1b088e4e12121037090dd9c92393fbe805cb6
parent5369c40f75fdcb1be7a7c06db212ce965c83a164
Merge "Add native memory accounting through custom allocator." into lmp-dev
runtime/gc/heap.cc
runtime/oat_file.h
runtime/runtime.cc