am 41357ba8: am 02e731fb: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward

Browse Source

Merge commit '41357ba8d6f2eae906a2af19a7296f47dbc6d286'

* commit '41357ba8d6f2eae906a2af19a7296f47dbc6d286':
  Import revised translations

...

This commit is contained in:

Jean-Baptiste Queru

2010-08-24 11:55:38 -07:00

committed by Android Git Automerger

parent ebd93b52e6 41357ba8d6

commit e742d42d54

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available