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

Browse Source

Merge commit '02e731fb6452df796d976cb9e407b210cfffcda5' into gingerbread-plus-aosp

* commit '02e731fb6452df796d976cb9e407b210cfffcda5':
  Import revised translations

...

This commit is contained in:

Jean-Baptiste Queru

2010-08-23 23:36:55 -07:00

committed by Android Git Automerger

parent dbdbd15296 02e731fb64

commit 41357ba8d6

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