am f54dbc8e: (-s ours) Merge changes Ie26719cb,I6d1b943b into ics-mr1

Browse Source

* commit 'f54dbc8e773642f924b9390d89df8779577e2493':
  Import revised translations.  DO NOT MERGE
  Restore deleted string still referenced from layout.

...

This commit is contained in:

Eric Fischer 2011-10-27 16:51:07 +00:00 committed by Android Git Automerger

parent 460e86128f f54dbc8e77

commit ead7e23143

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

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

Diff Content Not Available