tree 4fbf043592b84b3c1bd917276c525b080cb9260e
parent 870678a954e1e2a96caf76453c20de808253ffd1
parent 4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af
author Brian Carlstrom <bdc@google.com> 1281030045 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281030045 -0700

am 4ae1e382: Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread

Merge commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af' into gingerbread-plus-aosp

* commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af':
  Tracking merge of dalvik-dev to gingerbread