am 0c16fb32: merge from open-source master

Merge commit '0c16fb3262fb0ae107da80ffee9b3343b381b679'

* commit '0c16fb3262fb0ae107da80ffee9b3343b381b679':
This commit is contained in:
Jean-Baptiste Queru
2009-09-04 11:05:34 -07:00
committed by Android Git Automerger

Diff Content Not Available