am 3c659a8d: am f2af88e8: Tracking merge of dalvik-dev to gingerbread

Merge commit '3c659a8d647b2650d83712f9a6724b8ac50ef5ae'

* commit '3c659a8d647b2650d83712f9a6724b8ac50ef5ae':
  Tracking merge of dalvik-dev to gingerbread