tree c00c60c5e60c6d725fced3c5cd3219a434053de5
parent 703c85c69d3822067623a6dd7bfde4b734c7f84f
parent 7ab237f1efe578fc0462154bc239ad3b6cde2bda
author Jesse Wilson <jessewilson@google.com> 1282197522 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282197522 -0700

am 7ab237f1: Including dl heap stubs for the dalvikvm host build

Merge commit '7ab237f1efe578fc0462154bc239ad3b6cde2bda' into gingerbread-plus-aosp

* commit '7ab237f1efe578fc0462154bc239ad3b6cde2bda':
  Including dl heap stubs for the dalvikvm host build