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