tree 4bde2f2a9e4c86717681a71464a3b2c49152e200
parent 53cdbd85b45af28400e0351d1c14a86729aed266
parent 2123e41e40012ce604ee592bad5345dd56ad6c03
author Brian Carlstrom <bdc@google.com> 1282337544 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282337544 -0700

am 2123e41e: Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread

Merge commit '2123e41e40012ce604ee592bad5345dd56ad6c03' into gingerbread-plus-aosp

* commit '2123e41e40012ce604ee592bad5345dd56ad6c03':
  Tracking merge of dalvik-dev to gingerbread