am 4d42ccd1: Tracking merge of dalvik-dev to gingerbread

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

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