tree d1f8556c4c9e62aa29c02c037fbab9d206600270
parent f1b281b2e657c74911c434c557e3b6d705302341
parent c694fed73fe7642162d3b7d9b209f5d803e2db85
author Eric Fischer <enf@google.com> 1316215617 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316215617 -0700

am c694fed7: (-s ours) am a2d4c807: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-factoryrom

* commit 'c694fed73fe7642162d3b7d9b209f5d803e2db85':
  Import revised translations.  DO NOT MERGE