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

Merge commit '005f0d084ec3a5c7a2850b807c6054a1fc904daa'

* commit '005f0d084ec3a5c7a2850b807c6054a1fc904daa':
  Tracking merge of dalvik-dev to gingerbread