OSDN Git Service

Merge "Fix running with DlMalloc instead of RosAlloc."
authorMathieu Chartier <mathieuc@google.com>
Tue, 1 Apr 2014 22:37:45 +0000 (22:37 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 1 Apr 2014 22:37:45 +0000 (22:37 +0000)
commit252f848f68356551980701126481e0685bbded08
tree2aeec7b68eff57bb84218d70aa47ba936cf43171
parentb3d7eed9f760fa22e3a8e87ec2c8ff3fe50a1f50
parentda44d773dedf8aae6153e3423012f236cba3bfcd
Merge "Fix running with DlMalloc instead of RosAlloc."
runtime/gc/heap.cc
runtime/runtime.cc