tree 3081ddd107504efd37890467d5d4d24c8ce67273
parent 99b764e296e5dfcebad59e80460a8b74cd3a05f1
parent a2123e004adc5c432342a12f4c13141bdeef84ce
author Eric Fischer <enf@google.com> 1320255095 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320255095 +0000

am a2123e00: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

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