tree 926f90788720d4111ed99cd5a9818c67ace88c1f
parent 74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64
parent 24bf70cac0340c7556b4f98b690f3f9a3f80fc4a
author Brian Carlstrom <bdc@google.com> 1282758947 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282758947 -0700

am 24bf70ca: Merge "Update AndroidRuntime with dalvik-dev changes" into gingerbread

Merge commit '24bf70cac0340c7556b4f98b690f3f9a3f80fc4a' into gingerbread-plus-aosp

* commit '24bf70cac0340c7556b4f98b690f3f9a3f80fc4a':
  Update AndroidRuntime with dalvik-dev changes