OSDN Git Service

am d83f82c8: am e1a86627: Merge "Fix native allocation watermark clamping." into...
authorMathieu Chartier <mathieuc@google.com>
Thu, 4 Sep 2014 04:44:44 +0000 (04:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Sep 2014 04:44:44 +0000 (04:44 +0000)
commit1295dc9b3eecfa40e29c38ebb50a08e5fd3737b7
treeacfa3e7e4f5e329d81d8d869970e2e651fb2c9fd
parentacf0d779dcf7a299bf2519204ea85e09f1c7d5a4
parentd83f82c8e1d934d569c868b06f03b33698616f7d
am d83f82c8: am e1a86627: Merge "Fix native allocation watermark clamping." into lmp-dev

* commit 'd83f82c8e1d934d569c868b06f03b33698616f7d':
  Fix native allocation watermark clamping.
runtime/gc/heap.cc
runtime/gc/heap.h
runtime/native/dalvik_system_VMRuntime.cc