am 02123b7c: Tracking merge of dalvik-dev to gingerbread

Merge commit '02123b7cc8336ec5481f20c12ce5c7f2b9f044d4'

* commit '02123b7cc8336ec5481f20c12ce5c7f2b9f044d4':
  Tracking merge of dalvik-dev to gingerbread